Commit Graph

16 Commits

Author SHA1 Message Date
Alexis S. L. Carvalho
961a45df72 merge with crew-stable 2008-02-03 21:47:07 -02:00
Alexis S. L. Carvalho
68bddaa728 hg import: write the dirstate after every commit
This allows the transaction system to backup the correct file, so
that a future rollback can do the right thing.

This should fix issue963.
2008-02-03 21:03:46 -02:00
Patrick Mezard
2d2126f043 patch: handle empty vs no file in git patches (issue906) 2008-01-12 19:35:11 +01:00
Jesse Glick
b6fdc96f71 Permitting the import command to accept a --user option.
The prose section of the help text for the command already said that -u and -m
are accepted, but -u was not listed in the table of options, and did not work.
Useful when accepting patches from other people made by hg diff rather than hg
export. For completeness, also accepting -d DATE.
[CHANGES: rebased against 2f0da487820f, --no-commit option.]
2008-01-25 19:49:15 -05:00
Thomas Arendsen Hein
4ae55d1279 Test case for hg import --no-commit 2008-01-25 16:18:49 +01:00
Patrick Mezard
d1c841154d Merge with crew-stable 2008-01-12 20:49:07 +01:00
Patrick Mezard
eeff34ef5f Merge with crew-stable 2007-11-25 12:42:06 +01:00
Patrick Mezard
f280a41d83 test-import: test fuzziness, ambiguous patch locations 2007-11-25 12:17:30 +01:00
Patrick Mezard
c182383712 test-import: read email payload in binary mode 2007-11-10 21:30:43 +01:00
Patrick Mezard
59a5193f63 patch: fix git sendmail handling without proper mail headers 2007-10-08 22:20:23 +02:00
Thomas Arendsen Hein
05a43d0fea Added import test for [PATCH] subject and message body with subject 2007-07-02 22:45:58 +02:00
Alexis S. L. Carvalho
e488c0e84f Fix handling of paths when run outside the repo.
The main problem was that dirstate.getcwd() returned just "",
which was interpreted as "we're at the repo root".  It now returns
an absolute path.

The util.pathto function was also changed to deal with the "cwd is
an absolute path" case.
2007-03-16 00:22:58 -03:00
Thomas Arendsen Hein
7701e96286 Don't use -f for rm in tests where not needed. Drop /bin/ from /bin/rm. 2006-12-26 14:17:48 +01:00
Danek Duvall
9c364cbd6e Fix some tests for portability. 2006-08-09 12:05:40 -07:00
Mathieu Clabaut ext:(%22)
dced35893a Import say a file is not tracked after patching : test case 2006-08-02 09:29:17 +02:00
Vadim Gelfer
958489deb9 import: added tests, fixed bugs found by tests and asak. 2006-06-27 09:30:50 -07:00