* Sebastian Freundt <hroptatyr@xxxxxxxxxxx> writes:
> Some more words for fiddling with your own branch of SXEmacs or xetla.
> Everytime _you_ want to commit something _you_ have done, please make sure
> you have an up-to-date working directory.
> You can easily update your wd by (here with xetla as example):
> tla star-merge steve@xxxxxxxxxxxxxx/xetla--main--0.1
> or
> tla replay steve@xxxxxxxxxxxxxx/xetla--main--0.1
> Then if you want to change something, be sure to commit any pending stuff
> you get from the sync to the main-line to your local archive:
> tla commit
> And afterwards do your changes, and commit them.
> This helps to avoid confusion and -- more important -- conflicts since
> your commit only carries the changes you've done to the archive.
Good stuff. Let me make a small addition to those wise words.
If I'm working on small quick things I do it exactly as Seb
describes. But if I'm working on something that's going to take a
while I'll do something like the following...
1) star-merge from the mainline (in this situation, I'm not the
mainline as I am for SXEmacs, XEtla, Eicq, eMoney etc) _BEFORE_ I
start hacking to ensure I'm starting from up to date sources.
2) I'll commit the star-merge to my repo
3) hack hack hack and regardless of how long it takes I don't commit
anything or merge anything from mainline.
When I have finished hacking and _BEFORE_ I commit I checked to see if
there have been any changes in the mainline (if yes, go to step 4; if
no, go to step 9).
4) tla undo (this undoes all of my local changes)
5) tla star-merge from mainline
6) tla commit the star-merge
7) tla redo (which puts back my changes from before)
8) fix any conflicts
9) tla commit my changes
10) send a merge request to the mainline folks specifying that they
should replay the exact patch-number from me and then sync-tree
up to deal with missing patch logs (one hopes that the mainline
folks know what they are doing)
--
|---<Steve Youngs>---------------<GnuPG KeyID: A94B3003>---|
| In space, |
| No one can hear you rip a stinky |
|------------------------------------<steve@xxxxxxxxxxx>---|
pgpnUndsxsjrv.pgp
Description: PGP signature
|