Mercurial Mercurial > hg / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
README
author Patrick Mezard <pmezard@gmail.com>
Wed, 16 Nov 2011 12:53:10 +0100
branchstable
changeset 15511 6cae68a361ed
parent 12857 a9f91c844a3b
child 16217 df5ecb813426
permissions -rw-r--r--
import: fix parent selection when importing merges With "wp1" and "wp2" the current working directory parents, "p1" and "p2" the patch parents and "parents" the resulting commit parents, the current behaviour is: --bypass --exact p2 parents 0 0 0 [wp1, wp2] 0 0 1 [wp1, wp2]/buggy 0 1 0 [p1] 0 1 1 [p1, p2] 1 0 0 [wp1, wp2] 1 0 1 [p1, p2] 1 1 0 [p1] 1 1 1 [p1, p2] The original behaviour before f53dc0787424 was: --bypass --exact p2 parents 0 0 0 [wp1, wp2] 0 0 1 if p1 == wp1 then [p1, p2] otherwise [wp1, wp2] 0 1 0 [p1] 0 1 1 [p1, p2] This patch restores the previous behaviour when --bypass is not set, and align --bypass behaviour when --exact is not set with merge diffs.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
12857
a9f91c844a3b README: add small introduction
Martin Geisler <mg@lazybytes.net>
parents: 12856
diff changeset 
     1
 
Mercurial
a9f91c844a3b README: add small introduction
Martin Geisler <mg@lazybytes.net>
parents: 12856
diff changeset 
     2
 
=========
a9f91c844a3b README: add small introduction
Martin Geisler <mg@lazybytes.net>
parents: 12856
diff changeset 
     3
 












a9f91c844a3b
README: add small introduction



Martin Geisler <mg@lazybytes.net>


parents: 
12856

diff
changeset




     4


Mercurial is a fast, easy to use, distributed revision control tool













a9f91c844a3b
README: add small introduction



Martin Geisler <mg@lazybytes.net>


parents: 
12856

diff
changeset




     5


for software developers.













a9f91c844a3b
README: add small introduction



Martin Geisler <mg@lazybytes.net>


parents: 
12856

diff
changeset




     6









3935






1158d7018052
Move README info to wiki



Matt Mackall <mpm@selenic.com>


parents: 
3847

diff
changeset




     7


Basic install:








0






9117c6561b0b
Add back links from file revisions to changeset revisions



mpm@selenic.com


parents: 

diff
changeset




     8









3935






1158d7018052
Move README info to wiki



Matt Mackall <mpm@selenic.com>


parents: 
3847

diff
changeset




     9


 $ make            # see install targets













1158d7018052
Move README info to wiki



Matt Mackall <mpm@selenic.com>


parents: 
3847

diff
changeset




    10


 $ make install    # do a system-wide install













1158d7018052
Move README info to wiki



Matt Mackall <mpm@selenic.com>


parents: 
3847

diff
changeset




    11


 $ hg debuginstall # sanity-check setup













1158d7018052
Move README info to wiki



Matt Mackall <mpm@selenic.com>


parents: 
3847

diff
changeset




    12


 $ hg              # see help








205






d255d99a7cbd
README: integrate some changes from Kevin Smith



mpm@selenic.com


parents: 
204

diff
changeset




    13









8936






1de6e7e1bb9f
change wiki/bts URLs to point to new hostname



Dirkjan Ochtman <dirkjan@ochtman.nl>


parents: 
3935

diff
changeset




    14


See http://mercurial.selenic.com/ for detailed installation








3935






1158d7018052
Move README info to wiki



Matt Mackall <mpm@selenic.com>


parents: 
3847

diff
changeset




    15


instructions, platform-specific notes, and Mercurial user information.















Mercurial