pbranch for tracking upstream

[Peer Sommerlund]

On 17 August 2010 19:02, Neal Becker <ndbecker2 at gmail.com> wrote:

>
> Thanks for the help!  The reason I had thought I did not want linear, is I
> want to be able to drop patches when/if they are adopted upstream.
>
> To be clear, what is the procedure to drop one of my patches when a similar
> patch is adopted upstream?  (assume just a linear pbranch graph)
>

It is nicely described in the pbranch documentation.
Look for "deleting a patch"
http://arrenbrecht.ch/mercurial/pbranch/insert.htm#pagetoc__3

short summary:
1. pbackout patch & pmerge
2. commit --close-branch on patch & update .hg/pgraph & pmerge

I did not get round to implement delete in TortoiseHg - and it does not look
like I'll have time for it in the near future.
For issues on TortoiseHg support for pbranch, see
http://bitbucket.org/peso/thg-pbranch/issues?status=new&status=open

<http://bitbucket.org/peso/thg-pbranch/issues?status=new&status=open>
Regards,
Peer
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20100817/8199cc6d/attachment.html>