Abdelrazak Younes <[EMAIL PROTECTED]> writes:
| Lars Gullik Bjønnes wrote:
| > Abdelrazak Younes <[EMAIL PROTECTED]> writes:
| > | Lars Gullik Bjønnes wrote:
| > | > Abdelrazak Younes <[EMAIL PROTECTED]> writes:
| > | > | | I am doing that right now... difficult.
| > | > No it is dead easy if you followe the 3 step rebase procedure that I
| > | > have posted ealier.
| > | | Svn rebase is dead easy with my procedure also. The problem was
| > in the
| > | conflict between Peter geometry work and my cleanup work. Unless your
| > | merge program is much more intelligent that svn merge I don't think it
| > | would be any easier if I follow yours.
| > Ok please explain your 5 step method that is the same with every
| > rebase.
| > (And one that actually does a rebase, not one that just mergers
| > individual revisions in from trunk)
|
| Actually, I don't know what a rebase is.
When you begin a branch you (should) begin by taking a copy of trunk.
Then when you do a rebase, you take another copy of trunk and merge in
all the changes you had in your other branch. Note that these two
branches can very well have the same name and we end up with the three
stage rebase:
1. svn rm <branch>
2. svn cp <trunk> <branch>
3. a) update wc with new branch contents
b) svn merge -r<oldbranch-begin>:<oldbranch-end> \
<branch>@<oldbranch-end>
c) Fix conflicts
d) Commit
| It is not in the TortoiseSVN
| doc which explains how to maintain a branch and how to merge it back.
| That's what I followed. As for the details I sent them some time ago
| but I cannot find them. I basically merge sequentially until I find a
| potential conflict.
Usually I find it better to wait a bit longer for more "substantial"
changes to trunk before merging/rebasing.
| I fix it, manually if needed, and I continue until
| the next potential conflict. If I do that often enough, it is dead
| easy to stay up to date.
But your branch ends up in a sorry state, log-wise.
Also after doing a full merge of branch back to trunk, you should
delete the branch, and begin afresh.
(and you should perhaps not use <younes> as your branch name, since
that limits you to only one branch at a time.)
--
Lgb
