Package: bzr
Version: 0.11-1.1
Severity: important
when using push/pull, there are situations in which a branch's revision
history is rewritten, even when not using --overwrite.
i think the following commands demonstrate this bug:
+ bzr init branch1
+ cd branch1/
+ date > foo
+ bzr add foo
added foo
+ bzr ci -m foo
added foo
Committed revision 1.
+ date > bar
+ bzr add bar
added bar
+ bzr ci -m bar
added bar
Committed revision 2.
+ cd ..
+ bzr get -r 1 branch1/ branch2
Branched 1 revision(s).
+ cd branch2
+ date > bat
+ bzr add bat
added bat
+ bzr ci -m bat
added bat
Committed revision 2.
+ cd ../branch1
+ bzr merge ../branch2/
All changes applied successfully.
+ bzr ci -m 'merge branch2'
added bat
Committed revision 3.
+ bzr log --short
3 Vagrant Cascadian 2006-12-01
merge branch2
2 Vagrant Cascadian 2006-12-01
bar
1 Vagrant Cascadian 2006-12-01
foo
+ cd ../branch2/
+ bzr log --short
2 Vagrant Cascadian 2006-12-01
bat
1 Vagrant Cascadian 2006-12-01
foo
+ bzr pull
Using saved location: /tmp/bzrtest/branch1/
All changes applied successfully.
1 revision(s) pulled.
+ bzr log --short
3 Vagrant Cascadian 2006-12-01
merge branch2
2 Vagrant Cascadian 2006-12-01
bar
1 Vagrant Cascadian 2006-12-01
foo
notice that revno 2 for branch2 is actually changed after the pull. the
revision history for both branches is now identical, even though commits
happened in different order.
i would expect behaviour like this to only happen when push/pull
--overwrite is used.
live well,
vagrant
-- System Information:
Debian Release: 4.0
APT prefers testing
APT policy: (500, 'testing')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18-3-vserver-686
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Versions of packages bzr depends on:
ii python 2.4.3-11 An interactive high-level object-o
ii python-celementtree 1.0.5-8 Light-weight toolkit for XML proce
ii python-central 0.5.12 register and build utility for Pyt
ii python2.4 2.4.3-8 An interactive high-level object-o
Versions of packages bzr recommends:
ii python-paramiko 1.5.2-0.1 make SSH2 connections with python
ii python-pycurl 7.15.5-1 Python bindings to libcurl
-- no debconf information
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
