[Explanation and instructions for Evgeny's benefit]
* Steve Youngs <steve@xxxxxxxx> writes:
Evgeny,
Whenever I commit something to my xwem/xlib repo you'll get a post
like this one to the mailing list. (BTW, it's automated) Think of is
as as combination commit notice and merge request.
It is a log of the commit to _my_ repo.
And it is a request for you to merge these changes into _your_ repo.
I'll explain the steps to do this further down.
> Location: steve@xxxxxxxxxxxxxx http://arch.eicq.org/2004/
This is where you'll find my repo. Do this...
$ tla register-archive steve@xxxxxxxxxxxxxx \
http://arch.eicq.org/2004/
You only have to do this _ONE TIME_. Once it is done it is done.
Think of it as the arch equiv of doing `cvs login'.
> Revision: xwem--steve--2.0--patch-1
> Archive: steve@xxxxxxxxxxxxxx
> Creator: Steve Youngs <steve@xxxxxxxx>
> Date: Fri Dec 10 09:18:44 EST 2004
> Standard-date: 2004-12-09 23:18:44 GMT
Should be fairly self-explanatory.
> New-files:
If any files are being added to the repo, they are listed here.
[...]
> New-directories:
Same for new directories.
> Summary: Add some missing files to the repo
> Keywords:
This is the "ChangeLog" section. In this case, I had done `tla commit
-s "message here"' so there isn't anything in the "body" of the log.
If I've made changes to existing files, you'll also see diffs here.
OK, so what do you, Evgeny do with this now? Easy, follow these
steps...
(assumes you have already tla register-archive'd my repo)
1) cd into _your_ xwem working directory (a checkout of _your_ xwem
repo)
2) tla missing steve@xxxxxxxxxxxxxx/xwem--steve--2.0 RET
This will give you a list of all the patchsets in _my_ repo that don't
exist in _your_ repo. If it lists more than just the patch you are
intending to merge, you have more to do...
This time around it is a little different because it is the first time
you are getting anything from me. Lets look at a more common
example...
Suppose that I've asked you to merge xwem--steve--2.0--patch-12. And
when you do the `tla missing steve@...' you discover that you don't
have my patch-11 or my patch-12. You have to find out whether you
need my patch-11 (you very well may not need it because it could
simply be a commit I did after syncing to your tree.). tla gives you
the power...
$ tla cat-archive-log \
steve@xxxxxxxxxxxxxx/xwem--steve--2.0--patch-11 RET
That will show you the log for my patch-11. Lets say it was just a
sync of your tree. You don't want/need that.
In reality, this scenario is exactly what you'll face with this patch,
because you won't have my --base-0 revision which is simply a sync to
your repo. You don't want my base-0 but you do want my patch-1.
So (back to real life)...
3) tla replay steve@xxxxxxxxxxxxxx/xwem--steve--2.0--patch-1 RET
4) tla sync-tree steve@xxxxxxxxxxxxxx/xwem--steve--2.0--patch-1 RET
What step #4 will do is tell your repo that you have everything from
my repo, so a `tla missing steve@...' won't report anything missing.
Step #4 isn't always needed.
At this point, nothing has been committed to your repo. You can snoop
around, check out what I've done. Even make changes to my changes.
You can look at diffs with...
$ tla changes --diffs
OK, you've looked it over and decide that it should be included...
5) tla commit -s "merge from Steve (add missing files)" RET
6) tla archive-mirror RET
All done!
When you come across situations where things go wrong or are a little
different (maybe you want to reject the patch completely), just ask
and I'll give you some more step by step instructions.
I hope you've understood all of this, please ask questions if you're
not sure on anything.
--
|---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---|
| In space, |
| No one can hear you rip a stinky |
|---------------------------------------<steve@xxxxxxxx>---|
pgp4i6IrxwUMq.pgp
Description: PGP signature
|