Conflict while using "bzr pull"

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

John Arbash Meinel wrote:

> In truth, the easiest way to fix everything is to do:
> mv bzr.dev bzr.olddev
> mkdir bzr.dev
> mv bzr.olddev/.bzr bzr.dev/
> cd bzr.dev
> bzr revert

Actually, I just do "rm * -R; bzr revert".  Because .bzr doesn't match
the * glob, but almost everything revert cares about does.

> With 'bzr revert' there are 2 things that can trip it up:
> 1) having a bzr-tree-change directory. This is where merge/pull/revert
> do their magic, so if it exists, that means you had a failed action. And
> there may be files in there which don't exist anywhere else so it is
> unsafe to delete it automatically. (I think adding a --force would be a
> decent option).

Actually, with 'revert' specifically, it's *almost* safe for the revert
command to nuke the bzr-tree-change directory automatically if it fails.
  The exception is when a directory is renamed, because the directory
may contain valuable unversioned files.

> What do people think, should we have a "bzr revert --force", or maybe a
> "bzr revert --everything". I think it would be nice to have a single
> command which says, "I know things are messed up right now, get me back
> to exactly FOO, so I can continue with my life".

Perhaps "bzr revert --pristine" would delete all unversioned files as
well as restoring source files to the correct names and contents.

> I know one of the big complaints with "tla undo" is that it could easily
> get confused by duplicate ids, or all sorts of things. So that when
> things broke, you lost the tool to get you back to sanity. I believe
> "bzr revert" is much harder to break, but there still are edge cases
> where it won't do what you need.

If revert is more reliable, it's because we handle inventory as
something separate from versioned files, and the Inventory object
refuses to create malformed inventories.  (Thanks, Martin!)

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFDnY7o0F+nu1YWqI0RAoZbAJ0aztm2OZGYbrwXSjcYH0ljDpY69gCfQRRy
TYKDNfKG5fQy8PNwMVsQVgQ=
=2sPt
-----END PGP SIGNATURE-----