bzr branch reports a conflict!
Bug #33335 reported by
Andrew Bennetts
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Fix Released
|
High
|
Robert Collins |
Bug Description
$ bzr branch -r 3179 launchpad-upstream/ lp3179
bzr: WARNING: Conflict adding file lib/canonical/
1 conflicts encountered.
Branched 3179 revision(s).
("launchpad-
Unsurprisingly, the resulting checkout reports a heap of noise from "bzr st".
Changed in bzr: | |
assignee: | nobody → lifeless |
To post a comment you must log in.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Andrew Bennetts wrote: /launchpad. net/malone/ bugs/33335 launchpad/ doc/validation. txt. Moved existing file to launchpad/ doc/validation. txt.moved. upstream" is an rsynced copy of rocketfuel-built as of
| Public bug reported:
| https:/
|
| Affects: bzr (upstream)
| Severity: Normal
| Priority: (none set)
| Status: Unconfirmed
|
| Description:
| $ bzr branch -r 3179 launchpad-upstream/ lp3179
| bzr: WARNING: Conflict adding file
lib/canonical/
lib/canonical/
| 1 conflicts encountered.
| Branched 3179 revision(s).
|
| ("launchpad-
| 2006-02-02, for Canonical people that can access it.)
Bzr branch should be doing a build-tree, not a merge or revert, so
1. It should not produce conflicts
2. It should throw an exception if there are
Aaron enigmail. mozdev. org
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://
iD8DBQFEBmfN0F+ nu1YWqI0RAoygAJ 9SBJpSQ+ Ktkv1JTitY9w1jb FWX1wCdGomu P0Rx9eK8=
QPB594YE7EzUf1e
=9LUb
-----END PGP SIGNATURE-----