facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-09 00:14:35 +03:00
Code Issues Projects Releases Wiki Activity
7,204 Commits 24 Branches 62 Tags 322 MiB
f93bdf76d1
Commit Graph

19 Commits

Author SHA1 Message Date
Martin Geisler
43bddfde19 i18n, imerge: mark command line for translation 2008-09-06 17:44:02 +02:00
Martin Geisler
986af41320 i18n: mark strings for translation in imerge extension 2008-08-31 16:12:02 +02:00
Patrick Mezard
e54f2a771f imerge: replace "merge" with "internal:merge" when non-interactive 2008-03-23 20:37:02 +01:00
Matt Mackall
865487e7f2 revlog: report node and file when lookup fails 2008-03-11 17:42:29 -05:00
Joel Rosdahl
9c3f9d4bd6 imerge: Fix unbound name error and add a test case 2008-03-06 22:23:41 +01:00
Joel Rosdahl
5dae3059a0 Expand import * to allow Pyflakes to find problems 2008-03-06 22:23:26 +01:00
Matt Mackall
22c4273b99 filemerge: pull file-merging code into its own module 2008-02-03 19:29:05 -06:00
Brendan Cully
737a6eca37 imerge: add automerge flag to attempt to batch merge all conflicts 2007-08-23 22:45:41 -07:00
Brendan Cully
671f6fd2a7 imerge: fix ancestor calculation 
If wctx already has two parents, ancestor calculation is wrong.
Normally merge is called before wctx gets the second parent, so
we simulate this in imerge by temporarily popping the second parent
before calling filemerge. Highly dirty.

This patch also handles the ParseError move from cmdutil to dispatch.
 2007-08-23 19:51:59 -07:00
Brendan Cully
f3948130fd imerge: simplify c3b3184057da 2007-08-13 11:58:47 -07:00
Patrick Mezard
a7e536de52 imerge: fix status file lookups 2007-08-13 19:42:52 +02:00
Thomas Arendsen Hein
e34927453f Remove trailing spaces, fix indentation 2007-08-07 10:28:43 +02:00
Brendan Cully
8b26a09d27 imerge: gussy up dispatcher to support subcommand opts. 
Add -n, --resolved, --unresolved to status.
 2007-08-04 12:26:48 -07:00
Brendan Cully
6f2a9d642d Merge with crew 2007-08-04 09:33:10 -07:00
Brendan Cully
9fa1148786 imerge: handle renames 2007-08-03 18:05:20 -07:00
Thomas Arendsen Hein
0dfe60884f imerge: sorted() is only available in python2.4 and above 2007-08-02 14:04:51 +02:00
Benoit Boissinot
3588fd3abd imerge: tarfile.extractall is only available in python2.5 2007-08-02 14:04:00 +02:00
Brendan Cully
a23047ab44 Update imerge for new filemerge interface 2007-08-01 23:59:19 -07:00
Brendan Cully
dbb657852c imerge extension and test 2007-08-01 11:37:11 -07:00