[PATCH default] bookmarks: do not forward merged bookmark (issue1877)

David Soria Parra dsoria at gmx.net
Tue Mar 15 12:02:02 CDT 2011


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

On 15.03.2011 00:20, dsp at php.net wrote:
> # HG changeset patch
> # User David Soria Parra <dsp at php.net>
> # Date 1300143028 -3600
> # Node ID d47c4a96ec0fce32674eba8a1d6d99ab91e8dab1
> # Parent  9393a4d73161e88f05b3c2ec0c3c24e448cb40b6
> bookmarks: do not forward merged bookmark (issue1877)
I thought it's an invariant if you are on rev 3 and merge rev 4 that p1
in refers to rev 3. If that's not true, please do not queue this patch.
To ensure this issue is fixed p1 needs to be 3 in case you do hg up 3 &&
hg merge 4.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBAgAGBQJNf5uKAAoJEAT0aMuPE7Z1sIMP/2MYh8i2bGiUr38CbdqWJpYv
gIwuQmSFCPeQplTiDfJwbJR2VUmB0sUH0lyRGB1+Xyn0PCDGMrnT+ehsjiZg9GpL
RrSNVXDlTxbVg1ae+oDT1HiXcrTx/AYMSJX9FbcTkltvQNBxJ4GFIe3YzVk5rdiS
E8tv9FCO9UDOzSvVxqlAPWgXl7v/wS+BIG44nxSHx+wTjnD8MRHm79rjhzKirLAE
TfKiNcaf3iV1adzavtpNuODOX7M2ME/fnmarIaMEYdGgJN7blu72DNAGNIKrni4z
ndd79xN0DI1rffeudB2ow5BEG7EqJbA4jKwHzdWgf+zA1DnmAWm3nlHAVaE11Rc3
qepy+lzRMgP0chO8bK3RUIKT6imvpiO4cfH9MSf3bTwZevQ+H6KrHuugTKsvfXoP
yf6FJcp+7x9wiPBQqflPdZ+NFmKt26cIjxCvK2B4gPuINqPUS5CdtpY6TjqYiYhd
BA7bWAZuI/+bxp5YbuqJtUQay2Z9Z4cTYX/9ZjWwWbMclrIL3oMzh3ZAHWlNHZFz
PHcq+T0V9YfXhppxjgHUGawZIaa2T4fgdnyFEF2HPr6MPTkJB0qCCNrRZJTOxgtq
/ILUNtEAvAmjUDD1lIK4HjvFNm36vtsKve+G4j8fwwjQef+L2Sj66EkaMsn9zuqM
csyAjFP6niOOhOD9xXJ7
=bhG/
-----END PGP SIGNATURE-----


More information about the Mercurial-devel mailing list