Fri, 02 Mar 2012 09:54:45 +0100 merge stable heads stable
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 02 Mar 2012 09:54:45 +0100] rev 16207
merge stable heads
Thu, 01 Mar 2012 17:45:13 +0100 merge with stable
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 01 Mar 2012 17:45:13 +0100] rev 16206
merge with stable mercurial/filemerge.py in the default branch does not need the additional unlink calls, because the unlink calls at the end of filemerge.filemerge() are called for internal:dump, too.
Thu, 01 Mar 2012 17:35:12 +0100 filemerge: remove temporary files when using internal:dump as merge-tool stable
Thomas Arendsen Hein <thomas@intevation.de> [Thu, 01 Mar 2012 17:35:12 +0100] rev 16205
filemerge: remove temporary files when using internal:dump as merge-tool
Thu, 01 Mar 2012 16:28:24 -0600 Added signature for changeset 53e2cd303ecf stable
Matt Mackall <mpm@selenic.com> [Thu, 01 Mar 2012 16:28:24 -0600] rev 16204
Added signature for changeset 53e2cd303ecf
Thu, 01 Mar 2012 16:27:59 -0600 Added tag 2.1.1 for changeset 53e2cd303ecf stable
Matt Mackall <mpm@selenic.com> [Thu, 01 Mar 2012 16:27:59 -0600] rev 16203
Added tag 2.1.1 for changeset 53e2cd303ecf
Thu, 01 Mar 2012 17:49:59 +0200 dirstate: filecacheify _ignore (issue3278) stable 2.1.1
Idan Kamara <idankk86@gmail.com> [Thu, 01 Mar 2012 17:49:59 +0200] rev 16202
dirstate: filecacheify _ignore (issue3278) This still doesn't handle the case where a command is run with --config ui.ignore=path since we only look for changes in .hgignore.
(0) -10000 -3000 -1000 -300 -100 -30 -10 -6 +6 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip