facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 23:38:50 +03:00
Code Issues Projects Releases Wiki Activity
9,928 Commits 24 Branches 62 Tags 320 MiB
3b9db3f9d9
Commit Graph

8 Commits

Author SHA1 Message Date
Mads Kiilerich
3b9db3f9d9 Update test and man page for multiple matching encode/decode filters 2010-01-05 03:20:45 +01:00
Matt Mackall
e7ff3ff5bc merge: allow merging going backwards 
New behavior is generally superior and more correct, except possibly
with regards to missing files. hg up . is now effectively a no-op,
which is probably the desired behavior for people expecting to move to
tip, but may surprise people who were expecting deleted files to
reappear.

case 1: update to .

a-w -> a-w

classic: ancestor a
 missing     recreated     right?
 rmed        recreated     WRONG
 added       forgotten     WRONG
 changed     preserved     RIGHT
 conflicted  can't happen

backward merge: ancestor a  (NO EFFECT)
 missing     missing      wrong?
 rm'ed       rm'ed        RIGHT
 added       preserved	  RIGHT
 changed     preserved    RIGHT
 conflicted  can't happen

case 2: update to ancestor of .

a-b-w -> b-w
          \
           a

classic:  ancestor a
 missing       recreated        right?
 rmed          recreated        wrong?
 added         forgotten        wrong?
 changed       preserved        RIGHT
 conflicted    preserved        wrong?

backwards merge: ancestor b
 missing       missing or conflict  right?
 rm'ed         missing or conflict  right?
 changed       preserved            RIGHT
 conflicted    merge                RIGHT
 added         preserved            right?
 2009-06-08 18:14:44 -05:00
Patrick Mezard
0d0f719f13 tests: Windows compatibility fixes 
- printenv.py, md5sum.py, simplemerge, test-archive, test-merge1,
  test-merge-symlinks: set standard streams to binary mode
- test-encode: replace "gunzip" by "gzip -d"
- test-hup: requires fifo
 2008-10-12 19:11:59 +02:00
Thomas Arendsen Hein
61a257a6d9 cat --decode: Drop short option, use opts.get() instead of opts[] 
- hg archive --no-decode has no short option, too, and maybe both could use
  -d in the future to select revisions by date.
- opts.get makes python scripts calling cat() happy, because they don't have
  to pass the new option.
 2008-02-14 11:25:30 +01:00
Jesse Glick
1a18d77174 Option --decode for hg cat to apply decode filters. 
(Does not trigger expansion of keyword arguments when using keyword
extension, though that might be desirable as well.)
 2008-02-09 13:05:22 -05:00
Benoit Boissinot
e005ffc8c4 switch to the .hg/store layout, fix the tests 2006-12-01 13:34:09 +01:00
Thomas Arendsen Hein
1b244c77c7 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. 
Some systems show "Thu Jan 01" instead of "Thu Jan  1", which breaks tests.
Using "1000000" yields "Mon Jan 12 13:46:40 1970", which looks the same on
all systems.
 2006-03-13 13:05:41 +01:00
mpm@selenic.com
eac251ef7c Add file encoding/decoding support 2005-09-15 02:59:16 -05:00