pull --overwrite

[Robey Pointer]

There was a discussion earlier in the week that "pull --overwrite"  
should cause a branch to contain the same revisions as the original,  
and pivot the revision-history to match the original also.  I just  
tried it (on my private branch of bzr.dev) and it didn't work.  Below  
is a shorter example.

robey



~/code/testing$ bzr init
~/code/testing$ echo "original line" > foo
~/code/testing$ bzr add foo
added foo
~/code/testing$ bzr commit -m "initial commit"
Committed revision 1.
~/code/testing$ cd ..
~/code$ bzr branch testing testing2
Branched 1 revision(s).
~/code$ cd testing
~/code/testing$ echo "changed line" > foo
~/code/testing$ bzr commit -m "later change"
Committed revision 2.
~/code/testing$ cd ../testing2
~/code/testing2$ bzr merge ../testing
0 conflicts encountered.
~/code/testing2$ bzr commit -m "merge from original branch"
Committed revision 2.
~/code/testing2$ bzr log --line
Robey Pointer 2005-12-01 merge from original branch
Robey Pointer 2005-12-01 initial commit
~/code/testing2$ bzr pull --overwrite ../testing
0 revision(s) pulled.
~/code/testing2$ bzr log --line
Robey Pointer 2005-12-01 merge from original branch
Robey Pointer 2005-12-01 initial commit