upstream/mercurial-mirror Commit - r494:6020bde7

1

+ mkdir r1

1

+ mkdir r1

2

+ cd r1

2

+ cd r1

3

+ hg init

3

+ hg init

4

+ echo a

4

+ echo a

5

+ hg addremove

5

+ hg addremove

6

+ hg commit -t 1 -u test -d '0 0'

6

+ hg commit -t 1 -u test -d '0 0'

7

+ hg clone . ../r2

7

+ hg clone . ../r2

8

+ cd ../r2

8

+ cd ../r2

9

+ hg up

9

+ hg up

10

+ echo abc

10

+ echo abc

11

+ hg diff

11

+ hg diff

12

+ sed 's/\(\(---\|+++\).*\)\t.*/\1/'

12

+ sed 's/\(\(---\|+++\).*\)\t.*/\1/'

13

diff -r c19d34741b0a a

13

diff -r c19d34741b0a a

14

--- a/a

14

--- a/a

15

+++ b/a

15

+++ b/a

16

@@ -1,1 +1,1 @@

16

@@ -1,1 +1,1 @@

17

-a

17

-a

18

+abc

18

+abc

19

+ cd ../r1

19

+ cd ../r1

20

+ echo b

20

+ echo b

21

+ echo a2

21

+ echo a2

22

+ hg addremove

22

+ hg addremove

23

+ hg commit -t 2 -u test -d '0 0'

23

+ hg commit -t 2 -u test -d '0 0'

24

+ cd ../r2

24

+ cd ../r2

25

+ hg -q pull ../r1

25

+ hg -q pull ../r1

26

+ hg status

26

+ hg status

27

C a

27

C a

28

+ hg -d up

28

+ hg -d up

29

resolving manifests

29

resolving manifests

30

ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e

30

ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e

31

a versions differ, resolve

31

a versions differ, resolve

32

remote created b

32

remote created b

33

getting b

33

getting b

34

merging a

34

merging a

35

resolving a

35

resolving a

36

file a: other d730145abbf9 ancestor b789fdd96dc2

36

file a: other d730145abbf9 ancestor b789fdd96dc2

37

+ hg -d up -m

37

+ hg -d up -m

38

resolving manifests

38

resolving manifests

39

ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e

39

ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e

40

+ hg parents

40

+ hg parents

41

changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6

41

changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6

42

tag: tip

42

tag: tip

43

user: test

43

user: test

44

date: Thu Jan 1 00:00:00 1970

44

date: Thu Jan 1 00:00:00 1970

45

summary: 2

45

summary: 2

46

47

+ hg -v history

47

+ hg -v history

48

changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6

48

changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6

49

tag: tip

49

tag: tip

50

manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758

50

manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758

51

user: test

51

user: test

52

date: Thu Jan 1 00:00:00 1970

52

date: Thu Jan 1 00:00:00 1970

53

files: a

53

files: a b

54

files+: b

55

description:

54

description:

56

2

55

2

57

56

58

changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e

57

changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e

59

manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0

58

manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0

60

user: test

59

user: test

61

date: Thu Jan 1 00:00:00 1970

60

date: Thu Jan 1 00:00:00 1970

62

files+: a

61

files: a

63

description:

62

description:

64

1

63

1

65

64

66

+ hg diff

65

+ hg diff

67

+ sed 's/\(\(---\|+++\).*\)\t.*/\1/'

66

+ sed 's/\(\(---\|+++\).*\)\t.*/\1/'

68

diff -r 1e71731e6fbb a

67

diff -r 1e71731e6fbb a

69

--- a/a

68

--- a/a

70

+++ b/a

69

+++ b/a

71

@@ -1,1 +1,1 @@

70

@@ -1,1 +1,1 @@

72

-a2

71

-a2

73

+abc

72

+abc

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

             + mkdir r1
             + cd r1
             + hg init
             + echo a
             + hg addremove
             + hg commit -t 1 -u test -d '0 0'
             + hg clone . ../r2
             + cd ../r2
             + hg up
             + echo abc
             + hg diff
             + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
             diff -r c19d34741b0a a
             --- a/a
             +++ b/a
             @@ -1,1 +1,1 @@
             -a
             +abc
             + cd ../r1
             + echo b
             + echo a2
             + hg addremove
             + hg commit -t 2 -u test -d '0 0'
             + cd ../r2
             + hg -q pull ../r1
             + hg status
             C a
             + hg -d up
             resolving manifests
              ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
              a versions differ, resolve
             remote created b
             getting b
             merging a
             resolving a
             file a: other d730145abbf9 ancestor b789fdd96dc2
             + hg -d up -m
             resolving manifests
              ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
             + hg parents
             changeset:   1:1e71731e6fbb5b35fae293120dea6964371c13c6
             tag:         tip
             user:        test
             date:        Thu Jan  1 00:00:00 1970
             summary:     2
             + hg -v history
             changeset:   1:1e71731e6fbb5b35fae293120dea6964371c13c6
             tag:         tip
             manifest:    1:1165e8bd193e17ad7d321d846fcf27ff3f412758
             user:        test
             date:        Thu Jan  1 00:00:00 1970
-            files:       a
+            files:       a b
-            files+:      b
             description:
             changeset:   0:c19d34741b0a4ced8e4ba74bb834597d5193851e
             manifest:    0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
             user:        test
             date:        Thu Jan  1 00:00:00 1970
-            files+:      a
+            files:       a
             description:
             + hg diff
             + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
             diff -r 1e71731e6fbb a
             --- a/a
             +++ b/a
             @@ -1,1 +1,1 @@
             -a2
             +abc