Brendan Cully <brendan@kublai.com> [Mon, 10 Sep 2007 15:00:05 -0700] rev 5294
mq: fix regression in 6fd953d5faea
It caused qrefresh; qrefresh -X addedfile to leave the file as normal in dirstate.
It should be marked added on the second pass.
Patrick Mezard <pmezard@gmail.com> [Mon, 10 Sep 2007 23:53:23 +0200] rev 5293
Merge with crew-stable
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Mon, 10 Sep 2007 23:34:33 +0200] rev 5292
sshrepo: fix Windows command quoting
Patrick Mezard <pmezard@gmail.com> [Mon, 10 Sep 2007 23:36:01 +0200] rev 5291
extdiff: avoid repr() doubling paths backslashes under Windows
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 07 Sep 2007 17:54:38 +0200] rev 5290
merge with crew-stable
Dirkjan Ochtman <dirkjan@ochtman.nl> [Fri, 07 Sep 2007 17:38:52 +0200] rev 5289
Prevent WSGI apps from touching sys.stdin by setting ui.interactive to False.
Edward Lee <edward.lee@engineering.uiuc.edu> [Fri, 07 Sep 2007 16:35:43 +0200] rev 5288
interhg: allow more flexible pattern specification (fixes 2/3 of issue699)
- something else than "pat" followed by a number can be used as key
- something else than "/" can be used as delimiter
- "ilmsux" flags (e.g. "i" for case insensitive) can be used
Thomas Arendsen Hein <thomas@intevation.de> [Fri, 07 Sep 2007 16:14:51 +0200] rev 5287
Don't decode unicode strings.
This does not work with python2.3 and is probably not useful anyway with 2.4.
Brendan Cully <brendan@kublai.com> [Thu, 06 Sep 2007 18:12:36 -0700] rev 5286
Update test-record for 3ef190234b55
Bryan O'Sullivan <bos@serpentine.com> [Thu, 06 Sep 2007 10:52:54 -0700] rev 5285
record: change wording of initial per-file prompt
Steve Borho <steve@borho.org> [Wed, 05 Sep 2007 21:53:59 +0200] rev 5284
hgk: add repo root to window title
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 04 Sep 2007 18:37:28 +0200] rev 5283
Forgot to quote "6^" in test-parentrevspec (see 94e77a174f55)
Patrick Mezard <pmezard@gmail.com> [Tue, 04 Sep 2007 13:56:15 +0200] rev 5282
test-convert-hg-source: enforce conversion order with --date
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 01 Sep 2007 02:49:18 -0300] rev 5281
convert: rename a class and a function
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 01 Sep 2007 02:49:18 -0300] rev 5280
convert: mercurial_source: also search for copies in modified files
There are some corner cases where we may have a copy in a file that
isn't in the added list:
- the result of a hg copy --after --force
- after a merge across a (local) rename
Alexis S. L. Carvalho <alexis@cecm.usp.br> [Sat, 01 Sep 2007 02:49:18 -0300] rev 5279
convert: clear the dirstate before a conversion, invalidate it afterwards
Clearing it before the conversion protects us from whatever data were
there (file copies in particular).
Invalidating it after the conversion avoids writing a possibly
inconsistent dirstate to disk.