merging selective changes from merge directive patch file.

[John Arbash Meinel]

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

Niben M Singh wrote:
> I usually receive more than one patch a day. I can always use PULL for
> the first patch. After that I will have to do merge. It would be nice
> just to be able to PULL or MERGE with original author and comments for
> all the patches I receive. I am pretty sure if any of you are using
> manual gatekeeper workflow process then you will want this. I think this
> is how GIT operates.
> 
> Do you think this will be a new feature for Bzr?
> 
> Niben
> 

Generally, we recommend doing a merge + commit. The merged revisions
will still be available with all the commit info (bzr log -n0).

However, do to user demand, you can also use:

  bzr merge --pull ...

Which will try to pull if it can, and if not, falls back to merge (and
then you need to commit.)

I'm not 100% sure if it works with merge directives, but it should.

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkokHPsACgkQJdeBCYSNAAOmPACgmUZTb86TdfdvCRwuvXUgW4dF
vS0An3vwDyJs8uZ2cWbZZcIf4yeogy1o
=Vp0R
-----END PGP SIGNATURE-----