Hello. I have a bzr.dev with Vincent's fix, but don't see the bug as fixed.
First I create a conflict which moves a file:
cd /tmp
rm -rf test
mkdir test
cd test
bzr init br1
cd br1
echo > bar
bzr add bar
bzr commit -m r0
bzr branch . ../br2
echo > foo
bzr add .
bzr commit -m r1
cd ../br2
echo a > foo
bzr add .
bzr commit -m r2
bzr merge ../br1
+N foo
R foo => foo.moved
Conflict adding file foo. Moved existing file to foo.moved.
1 conflicts encountered.
bzr st
added:
foo
renamed:
foo => foo.moved
conflicts:
Conflict adding file foo. Moved existing file to foo.moved.
pending merge tips: (use -v to see all merge revisions)
Guilhem Bichot 2010-04-28 r1
bzr resolve --all # playing role of a new user not well aware
bzr st
added:
foo
renamed:
foo => foo.moved
pending merge tips: (use -v to see all merge revisions)
Guilhem Bichot 2010-04-28 r1
bzr commit -m bug
Committing to: /tmp/test/br2/
added foo
renamed foo => foo.moved
Committed revision 3.
So I can commit, no warning.
I think I don't understand what has been fixed exactly.
The changelog says
http://doc.bazaar.canonical.com/bzr.dev/en/release-notes/bzr-2.2.0b1.html
"bzr add will not add conflict related files unless explicitly required.
(Vincent Ladeuil, #322767, #414589)"
which to me should cover auto-added .moved files.
Maybe something with OTHER/BASE/THIS files instead?
Thanks!
--
MYSQL/BZR - P3: How to avoid that people commit .OTHER/.BASE/.THIS/.moved files?
https://bugs.launchpad.net/bugs/322767
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
--
ubuntu-bugs mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
