| 2009-12-01 16:17:21 |
Alexander Belchenko |
description |
See steps below:
C:\Temp\7>bzr init a
Created a standalone tree (format: pack-0.92)
C:\Temp\7\a>bzr ci -m1 --unch
Committing to: C:/Temp/7/a/
Committed revision 1.
C:\Temp\7>bzr get a b
Branched 1 revision(s).
C:\Temp\7\b>bzr ci -m2 --unch
Committing to: C:/Temp/7/b/
Committed revision 2.
C:\Temp\7\b>bzr tag foo
Created tag foo.
C:\Temp\7\a>bzr tag foo
Created tag foo.
C:\Temp\7\a>bzr merge ../b
All changes applied successfully.
C:\Temp\7\a>bzr st
pending merge tips: (use -v to see all merge revisions)
Alexander Belchenko 2009-12-01 2
C:\Temp\7\a>bzr tags
foo 1
But I do have conflicts message on pull/push:
C:\Temp\7\a>bzr pull ../b
All changes applied successfully.
Now on revision 2.
Conflicting tags:
foo |
See steps below:
C:\Temp\7>bzr init a
Created a standalone tree (format: pack-0.92)
C:\Temp\7\a>bzr ci -m1 --unch
Committing to: C:/Temp/7/a/
Committed revision 1.
C:\Temp\7>bzr get a b
Branched 1 revision(s).
C:\Temp\7\b>bzr ci -m2 --unch
Committing to: C:/Temp/7/b/
Committed revision 2.
C:\Temp\7\b>bzr tag foo
Created tag foo.
C:\Temp\7\a>bzr tag foo
Created tag foo.
C:\Temp\7\a>bzr merge ../b
All changes applied successfully.
C:\Temp\7\a>bzr st
pending merge tips: (use -v to see all merge revisions)
Alexander Belchenko 2009-12-01 2
C:\Temp\7\a>bzr tags
foo 1
But I do have conflicts message on pull/push:
C:\Temp\7\a>bzr revert
C:\Temp\7\a>bzr pull ../b
All changes applied successfully.
Now on revision 2.
Conflicting tags:
foo
|
|
