facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity
5,499 Commits 24 Branches 62 Tags 320 MiB
98901c4f4d
Commit Graph

30 Commits

Author SHA1 Message Date
Sascha Wilde
dddf718ec2 Use smerge minor mode in emacs to resolve conflicts. 
The condition-case is used to suppress errors with emacs versions before 21.
 2007-08-15 17:27:51 +02:00
Thomas Arendsen Hein
5501bd63c6 Check for conflict markers in hgmerge (issue471) 2007-07-08 13:44:41 +02:00
Radoslaw Szkodzinski
853d2fea0b Try to use /usr/bin/test or /bin/test to work around missing features. 
The builtin "test" of Solaris 8 /bin/sh doesn't understand -nt.
 2006-04-07 22:31:54 +02:00
Vadim Gelfer
ae252f533e run merge program in repo root. 
before, merge program was run in user current directory.  Well defined
location is better for scripts.  no more need to pass HG_ROOT to merge
program now.
 2006-03-11 21:33:19 -08:00
Vadim Gelfer
cb34430359 give more info to hgmerge script. 2006-03-10 23:34:02 -08:00
Vadim Gelfer
a8e31fc914 fix broken environment save/restore when a hook runs. 
move "run commend with different env/cwd" code out to function in util.
new function is called esystem.
 2006-03-10 22:24:19 -08:00
Radoslaw Szkodzinski
f317122c08 hgmerge: do not use file with markers in tools merging themselves 
This time I forgot about a crucial part of the logic change.
The patch makes kdiff3 and tkdiff useful again.
 2006-02-23 18:10:04 +01:00
Thomas Arendsen Hein
061017fafb Fix hgmerge: mkdir "'/tmp'/hgmerge..." and ask_if_merged() didn't work. 2006-02-23 14:42:47 +01:00
Radoslaw Szkodzinski
c629a66a79 hgmerge: add meld support 2006-02-21 15:48:22 -06:00
Radoslaw Szkodzinski
2321c457be hgmerge: improve "apps not found" message 2006-02-21 15:48:19 -06:00
Radoslaw Szkodzinski
2bb2a3d01e hgmerge: logic changes 
Details:
  - keep automatic merge conflicts in $LOCAL
  - do not assume that $EDITOR returns proper error code
  - fix a slight mistake in diff+patch merge success detection
    (it could succeed if the $EDITOR failed to run)
 2006-02-21 15:48:16 -06:00
Radoslaw Szkodzinski
cb8c24f147 hgmerge: add and use ask_if_merged function 
This patch, unlike the earlier ones, doesn't use unportable select builtin.
 2006-02-21 15:48:12 -06:00
Radoslaw Szkodzinski
be682ca909 hgmerge: fix diff+patch detection; cleanups 
Details:
  - actually show help message when no tools are found
  - whitespace cleanup (stupid emacs)
  - quote more variables
  - simplify merge/diff3 error handling
 2006-02-21 15:48:09 -06:00
Radoslaw Szkodzinski
b2b518aa1e hgmerge: various cleanups 
Details:
  - put temporary file names into variables
  - make all temporary file names end with random part
  - cleanup FileMerge handling
  - do not use hardlinks in FileMerge change test (breaks on FAT)
  - try harder to keep file mtime unchanged in case of failed merge
 2006-02-06 17:32:10 -06:00
Radoslaw Szkodzinski
1eba0eaedd hgmerge: add cleanup functions 
This patch adds functions cleanup, success and failure.
The last two of these should be used instead of exit.
Current code was changed to use them.
It also moves $HGTMP to the top of the file (it's used in the cleanup
function), changes the comment and removes now unneeded trap
in the diff+patch merge.
 2006-02-06 17:32:06 -06:00
Radoslaw Szkodzinski
5352dbd6fd hgmerge: add and use more tool variables 
This patch adds even more customisable variables with tool paths.
Also moves $FILEMERGE where it belongs.
 2006-02-06 17:32:00 -06:00
Brendan Cully
66ab19c498 Safer version of FileMerge merge 2006-01-30 12:02:12 +13:00
Christian Ebert
73585d70f6 Use of opendiff as merge program on MacOS X 
Hello,

If one has the developer tools installed on MacOS X there's
another alternative for the merge program.

Invocation could be done somehow like in the attached patch for
hgmerge.
 2006-01-29 10:10:00 +13:00
levon@movementarian.org
048c5d5a70 Fix use of diff(1) triggered by set -e. 
Search harder for a decent diff/patch to use.
 2005-10-24 14:55:53 -07:00
Thomas Arendsen Hein
a40b8a51f1 Cleaned up trap handling: 
- Use numbers instead of signal names
- No need to explicitly call "cleanup_exit RC" to exit with return code RC.
 2005-08-04 17:43:05 +01:00
Thomas Arendsen Hein
8076915aa6 If rejects are empty after using the editor, merge with diff+patch was ok. 2005-08-04 17:23:31 +01:00
Thomas Arendsen Hein
6f8f8feeba Shortened hgmerge a little bit. 2005-08-04 17:16:41 +01:00
Thomas Arendsen Hein
4bfe4b7759 Hide error message of type command. 2005-08-04 16:56:44 +01:00
Thomas Arendsen Hein
79e79d89bb Remove usage of ${par:-word}, which and mktemp. Quote filenames. 2005-07-29 14:51:41 +01:00
Thomas Arendsen Hein
51ae3ccedf Remove bashisms and use /bin/sh instead of /bin/bash. 
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Remove bashisms and use /bin/sh instead of /bin/bash.

manifest hash: 25560e04ff8ac33a6d8b82d2328b4e90578bee4c
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)

iD8DBQFCxOEjW7P1GVgWeRoRAm9XAJ9IjlbMerPYEhKQQu7Ufcm6630cDwCfdXJ3
865XH6YVMuCYNjf3eibwQaM=
=r3gh
-----END PGP SIGNATURE-----
 2005-07-01 07:22:27 +01:00
Thomas Arendsen Hein
fe0ed7dcd1 Use vi if $EDITOR is unset. 2005-06-10 07:52:39 +01:00
Thomas Arendsen Hein
f08a8be556 Check if $DISPLAY is set before using tkdiff or kdiff3. 2005-06-10 07:50:20 +01:00
mpm@selenic.com
9cb4207872 Mark the usual things executable 
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Mark the usual things executable

manifest hash: e55dde46fd1a97ce338c1ac71278b67ca9d96bf7
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCpz5RywK+sNU5EO8RAnypAJwLpjrQ09nMSJUELtCondHI0fvuVACfQu2J
mFi9D3L9ULGO457NWB4h3kY=
=3bcD
-----END PGP SIGNATURE-----
 2005-06-08 10:52:01 -08:00
mpm@selenic.com
53fcaa2eef hgmerge: use diff3 if available 
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

hgmerge: use diff3 if available

diff3 may be more readily available than merge

manifest hash: 67a314ac42aa78410d64a6c3d36c2d575a588533
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCoRUtywK+sNU5EO8RAmFPAJ0aN8VNvN9zpE/zov6wT3M98vGfDwCfXEOk
xZlQHYIGrCLOFQiCQxIfr7I=
=Asv9
-----END PGP SIGNATURE-----
 2005-06-03 18:42:53 -08:00
mpm@selenic.com
63e6cb46d3 Replace tkmerge with hgmerge 
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Replace tkmerge with hgmerge

hgmerge attempts to find and use merge, kdiff3, tkmerge, and diff+patch.
hg will use hgmerge unless overridden with HGMERGE

manifest hash: 9137a620df4b235e66343b0fd0dba87fe631546e
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)

iD8DBQFCoRGrywK+sNU5EO8RAi2VAJ9bh97ChGJymP/p8rvCuyNAMnk1bQCgrIGP
vYI6qlyWKQZ01ObUTAIg92o=
=+mRH
-----END PGP SIGNATURE-----
 2005-06-03 18:27:55 -08:00