right way to reverse engineer a "virgin" branch?

[Gordon Tyler]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
 
On 4/22/2011 3:37 PM, Chris Hecker wrote:
>
> Is there a way to selectively reject parts of a merge? So, if I
> delete images/* in virgin, and then merge version -> site, can I
> accept the merge as done, but not lose the files?
>

I think you can do that like this:

$ bzr merge $source
$ bzr revert .

The dot is important! You can then check whether there is a pending
merge with 'bzr st'.

Ciao,
Gordon

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (MingW32)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/
 
iQEcBAEBAgAGBQJNseTXAAoJEIrPJfWinA2uBQ8H/2jj2sgWlLFnHtqzIP76JUKr
usaeVrKEjJ1Bw0zfsO65TYI/ox/mK9/GpXYoL05SKz/1qgOjaAGmZdb/24tEQ9Ej
7n/fAvuPpNHKDJA/qwuHBr6zawR26v/nj7NNGrGLnr3RmIUYxNV58bfxXQJs9eMk
k5rFaDJlIurmN5WfUt1kj1ENR66mfYG/biXFQLmUWInToKAhgbzfFoKS/NEsNwjb
OzJ69GNe1Y8oPq1VPb++iaH7N2FbKBDZlKoRBb6NBiPW5I0WQxVJq3oSEZu2Yfg3
/Po5ARi2LrFMeQOkbM6bPr0+WHyOa8RCU3d/fr6c3CNuP39vCOF6/tk40/fMvDM=
=PlPV
-----END PGP SIGNATURE-----