Avoiding conflicts in .hgtags

[Arne Babenhauserheide]

Am Montag 08 Dezember 2008 18:20:24 schrieb Peter Arrenbrecht:
> On Mon, Dec 8, 2008 at 5:35 PM, Greg Ward <gerg.ward+hg at gmail.com> wrote:
> > On 08 December 2008, Peter Arrenbrecht said:
> >> I think Mercurial should have a specialized merger for such files.
> >> There are others, like .hgsigs, and there will be more, like
> >> .hgsubrepo, etc.
> >
> > The same thought occurred to me, so I've started writing a very
> > simplistic and naive script to merge .hgtags files.  Will share it
> > here for feedback when I've got it working.
>
> Highly appreciated. Thanks!
> -parren

Also from me! 

Apart from integration into the main hg commands, that's the last part needed 
to make the group extension usable in a production environment (since a group 
revision with the change in the .hggroups file is always a child of the most 
recent revision inside the group, there's merging of .hggroups on almost every 
group creation). 

Many thanks! 
- Arne

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20081208/7da0c4c1/attachment-0001.asc>