| 1 |
To merge from trunk to branch. |
| 2 |
|
| 3 |
1. Find the branch point on the branch. |
| 4 |
|
| 5 |
svn log --stop-on-copy . |
| 6 |
|
| 7 |
This will stop at the branch point |
| 8 |
|
| 9 |
2. Find out where trunk is at |
| 10 |
|
| 11 |
svn update |
| 12 |
|
| 13 |
3. Do the merge from trunk |
| 14 |
|
| 15 |
svn merge -r 246:248 . ../branches/ehcache-1.2.4 |
| 16 |
|
| 17 |
4. Commit with a commit message that indicated the merge so you know it for next time |
| 18 |
|
| 19 |
e.g. svn commit -m "Merge from trunk svn merge -r 246:248 . ../branches/ehcache-1.2.4" |
| 20 |
|
| 21 |
|
| 22 |
|
| 23 |
To merge from branch to trunk |
| 24 |
|
| 25 |
|
| 26 |
1. Find the branch point on the branch. |
| 27 |
|
| 28 |
svn log --stop-on-copy . |
| 29 |
|
| 30 |
This will stop at the branch point |
| 31 |
|
| 32 |
2. Do the merge from trunk |
| 33 |
|
| 34 |
svn merge --force -r 74:HEAD ../branches/ehcache-1.2.4 |
| 35 |
|
| 36 |
3. Commit with a commit message that indicated the merge so you know it for next time |
| 37 |
|
| 38 |
e.g. svn commit -m "Merge from branch revision 74 to trunk" |
| 39 |
|