In article <4df50623.4020...@netwok.org>,
Éric Araujo wrote:
> Le 12/06/2011 20:01, Benjamin Peterson a écrit :
> > Another method would be to write a extension for Mercurial which is
> > "smart" about the format of Misc/NEWS and could do the resolution
> > automatically.
> Even easier than an e
Le 12/06/2011 20:01, Benjamin Peterson a écrit :
> Another method would be to write a extension for Mercurial which is
> "smart" about the format of Misc/NEWS and could do the resolution
> automatically.
Even easier than an extension: a merge tool, i.e. a script that knows
how to parse the file an
2011/6/12 Ned Deily :
> There are several ways we could eliminate this needless pain. Probably
> the simplest would be to agree on a simple format for including the NEWS
> and ACK info in the hg commit message and then agree on a process to
> batch update the NEWS and ACK files from the commit mes
In article ,
Nick Coghlan wrote:
> On Sun, Jun 12, 2011 at 9:59 PM, "Martin v. Löwis" wrote:
> >> Until mercurial has better tools to bundle multiple changesets into a
> >> single coherent group of changes, it's still preferable to do the
> >> export/import dance.
> > Why did we migrate to Mercu
On Mon, Jun 13, 2011 at 12:01 AM, "Martin v. Löwis" wrote:
>> It's also possible that we should be encouraging greater use of
>> Mercurial Queues [1] and making them an official part of our
>> development process.
>
> Can you publish/push a patch queue to a remote repository?
bitbucket certainly
> It's also possible that we should be encouraging greater use of
> Mercurial Queues [1] and making them an official part of our
> development process.
Can you publish/push a patch queue to a remote repository?
Regards,
Martin
___
python-committers mail
On Sun, Jun 12, 2011 at 11:03 PM, Nick Coghlan wrote:
>
> [1] http://mercurial.selenic.com/wiki/MqExtension
Arguably better link: http://mercurial.selenic.com/wiki/MqTutorial
Cheers,
Nick.
--
Nick Coghlan | ncogh...@gmail.com | Brisbane, Australia
__
On Sun, Jun 12, 2011 at 9:59 PM, "Martin v. Löwis" wrote:
>> Until mercurial has better tools to bundle multiple changesets into a
>> single coherent group of changes, it's still preferable to do the
>> export/import dance.
>
> Why did we migrate to Mercurial, then?
The merge tools are still bett
> Until mercurial has better tools to bundle multiple changesets into a
> single coherent group of changes, it's still preferable to do the
> export/import dance.
Why did we migrate to Mercurial, then?
Regards,
Martin
___
python-committers mailing list
