upstream/mercurial-mirror Commit - r2552:bb403d42

1

(the addremove command is deprecated; use add and remove --after instead)

1

(the addremove command is deprecated; use add and remove --after instead)

2

adding a

2

adding a

3

1 files updated, 0 files merged, 0 files removed, 0 files unresolved

3

1 files updated, 0 files merged, 0 files removed, 0 files unresolved

4

0 files updated, 0 files merged, 0 files removed, 0 files unresolved

4

0 files updated, 0 files merged, 0 files removed, 0 files unresolved

5

diff -r 33aaa84a386b a

5

diff -r 33aaa84a386b a

6

--- a/a

6

--- a/a

7

+++ b/a

7

+++ b/a

8

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

8

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

9

-a

9

-a

10

+abc

10

+abc

11

(the addremove command is deprecated; use add and remove --after instead)

11

(the addremove command is deprecated; use add and remove --after instead)

12

adding b

12

adding b

13

M a

13

M a

14

changeset: 0:33aaa84a386b

14

changeset: 0:33aaa84a386b

15

user: test

15

user: test

16

date: Mon Jan 12 13:46:40 1970 +0000

16

date: Mon Jan 12 13:46:40 1970 +0000

17

summary: 1

17

summary: 1

18

19

resolving manifests

19

resolving manifests

20

force None allow None moddirstate True linear True

20

force None allow None moddirstate True linear True

21

ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e

21

ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e

22

a versions differ, resolve

22

a versions differ, resolve

23

remote created b

23

remote created b

24

getting b

24

getting b

25

merging a

25

merging a

26

resolving a

26

resolving a

27

file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2

27

file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2

28

1 files updated, 1 files merged, 0 files removed, 0 files unresolved

28

1 files updated, 1 files merged, 0 files removed, 0 files unresolved

29

changeset: 1:802f095af299

29

changeset: 1:802f095af299

30

tag: tip

30

tag: tip

31

user: test

31

user: test

32

date: Mon Jan 12 13:46:40 1970 +0000

32

date: Mon Jan 12 13:46:40 1970 +0000

33

summary: 2

33

summary: 2

34

35

resolving manifests

35

resolving manifests

36

force None allow None moddirstate True linear True

36

force None allow None moddirstate True linear True

37

ancestor a0c8bcbbb45c local 1165e8bd193e remote a0c8bcbbb45c

37

ancestor a0c8bcbbb45c local 1165e8bd193e remote a0c8bcbbb45c

38

remote deleted b

38

remote deleted b

39

removing b

39

removing b

40

0 files updated, 0 files merged, 1 files removed, 0 files unresolved

40

0 files updated, 0 files merged, 1 files removed, 0 files unresolved

41

changeset: 0:33aaa84a386b

41

changeset: 0:33aaa84a386b

42

user: test

42

user: test

43

date: Mon Jan 12 13:46:40 1970 +0000

43

date: Mon Jan 12 13:46:40 1970 +0000

44

summary: 1

44

summary: 1

45

46

abort: there is nothing to merge, just use 'hg update'

46

abort: there is nothing to merge, just use 'hg update' or look at 'hg heads'

47

failed

47

failed

48

changeset: 0:33aaa84a386b

48

changeset: 0:33aaa84a386b

49

user: test

49

user: test

50

date: Mon Jan 12 13:46:40 1970 +0000

50

date: Mon Jan 12 13:46:40 1970 +0000

51

summary: 1

51

summary: 1

52

53

resolving manifests

53

resolving manifests

54

force None allow None moddirstate True linear True

54

force None allow None moddirstate True linear True

55

ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e

55

ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e

56

a versions differ, resolve

56

a versions differ, resolve

57

remote created b

57

remote created b

58

getting b

58

getting b

59

merging a

59

merging a

60

resolving a

60

resolving a

61

file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2

61

file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2

62

1 files updated, 1 files merged, 0 files removed, 0 files unresolved

62

1 files updated, 1 files merged, 0 files removed, 0 files unresolved

63

changeset: 1:802f095af299

63

changeset: 1:802f095af299

64

tag: tip

64

tag: tip

65

user: test

65

user: test

66

date: Mon Jan 12 13:46:40 1970 +0000

66

date: Mon Jan 12 13:46:40 1970 +0000

67

summary: 2

67

summary: 2

68

69

changeset: 1:802f095af299cde27a85b2f056aef3829870956c

69

changeset: 1:802f095af299cde27a85b2f056aef3829870956c

70

tag: tip

70

tag: tip

71

user: test

71

user: test

72

date: Mon Jan 12 13:46:40 1970 +0000

72

date: Mon Jan 12 13:46:40 1970 +0000

73

files: a b

73

files: a b

74

description:

74

description:

75

2

75

2

76

77

78

changeset: 0:33aaa84a386bd609094aeb21a97c09436c482ef1

78

changeset: 0:33aaa84a386bd609094aeb21a97c09436c482ef1

79

user: test

79

user: test

80

date: Mon Jan 12 13:46:40 1970 +0000

80

date: Mon Jan 12 13:46:40 1970 +0000

81

files: a

81

files: a

82

description:

82

description:

83

1

83

1

84

85

86

diff -r 802f095af299 a

86

diff -r 802f095af299 a

87

--- a/a

87

--- a/a

88

+++ b/a

88

+++ b/a

89

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

89

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

90

-a2

90

-a2

91

+abc

91

+abc

92

1 files updated, 0 files merged, 1 files removed, 0 files unresolved

92

1 files updated, 0 files merged, 1 files removed, 0 files unresolved

93

(the addremove command is deprecated; use add and remove --after instead)

93

(the addremove command is deprecated; use add and remove --after instead)

94

adding b

94

adding b

95

M a

95

M a

96

changeset: 1:802f095af299

96

changeset: 1:802f095af299

97

user: test

97

user: test

98

date: Mon Jan 12 13:46:40 1970 +0000

98

date: Mon Jan 12 13:46:40 1970 +0000

99

summary: 2

99

summary: 2

100

101

resolving manifests

101

resolving manifests

102

force None allow None moddirstate True linear False

102

force None allow None moddirstate True linear False

103

ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392

103

ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392

104

a versions differ, resolve

104

a versions differ, resolve

105

b versions differ, resolve

105

b versions differ, resolve

106

this update spans a branch affecting the following files:

106

this update spans a branch affecting the following files:

107

a (resolve)

107

a (resolve)

108

b (resolve)

108

b (resolve)

109

aborting update spanning branches!

109

aborting update spanning branches!

110

(use 'hg merge' to merge across branches or 'hg update -C' to lose changes)

110

(use 'hg merge' to merge across branches or 'hg update -C' to lose changes)

111

failed

111

failed

112

abort: outstanding uncommitted changes

112

abort: outstanding uncommitted changes

113

failed

113

failed

114

resolving manifests

114

resolving manifests

115

force False allow True moddirstate True linear False

115

force False allow True moddirstate True linear False

116

ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392

116

ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392

117

a versions differ, resolve

117

a versions differ, resolve

118

b versions differ, resolve

118

b versions differ, resolve

119

merging a

119

merging a

120

resolving a

120

resolving a

121

file a: my d730145abbf9 other 13e0d5f949fa ancestor b789fdd96dc2

121

file a: my d730145abbf9 other 13e0d5f949fa ancestor b789fdd96dc2

122

merging b

122

merging b

123

resolving b

123

resolving b

124

file b: my 1e88685f5dde other 61de8c7723ca ancestor 000000000000

124

file b: my 1e88685f5dde other 61de8c7723ca ancestor 000000000000

125

0 files updated, 2 files merged, 0 files removed, 0 files unresolved

125

0 files updated, 2 files merged, 0 files removed, 0 files unresolved

126

(branch merge, don't forget to commit)

126

(branch merge, don't forget to commit)

127

changeset: 1:802f095af299

127

changeset: 1:802f095af299

128

user: test

128

user: test

129

date: Mon Jan 12 13:46:40 1970 +0000

129

date: Mon Jan 12 13:46:40 1970 +0000

130

summary: 2

130

summary: 2

131

132

changeset: 2:030602aee63d

132

changeset: 2:030602aee63d

133

tag: tip

133

tag: tip

134

parent: 0:33aaa84a386b

134

parent: 0:33aaa84a386b

135

user: test

135

user: test

136

date: Mon Jan 12 13:46:40 1970 +0000

136

date: Mon Jan 12 13:46:40 1970 +0000

137

summary: 3

137

summary: 3

138

139

diff -r 802f095af299 a

139

diff -r 802f095af299 a

140

--- a/a

140

--- a/a

141

+++ b/a

141

+++ b/a

142

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

142

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

143

-a2

143

-a2

144

+abc

144

+abc

145

adding a

145

adding a

146

pulling from ../a

146

pulling from ../a

147

requesting all changes

147

requesting all changes

148

adding changesets

148

adding changesets

149

adding manifests

149

adding manifests

150

adding file changes

150

adding file changes

151

added 1 changesets with 1 changes to 1 files

151

added 1 changesets with 1 changes to 1 files

152

1 files updated, 0 files merged, 0 files removed, 0 files unresolved

152

1 files updated, 0 files merged, 0 files removed, 0 files unresolved

	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

             (the addremove command is deprecated; use add and remove --after instead)
             adding a
 files updated, 0 files merged, 0 files removed, 0 files unresolved
 files updated, 0 files merged, 0 files removed, 0 files unresolved
             diff -r 33aaa84a386b a
             --- a/a
             +++ b/a
             @@ -1,1 +1,1 @@ a
             -a
             +abc
             (the addremove command is deprecated; use add and remove --after instead)
             adding b
             M a
             changeset:   0:33aaa84a386b
             user:        test
             date:        Mon Jan 12 13:46:40 1970 +0000
             summary:     1
             resolving manifests
              force None allow None moddirstate True linear True
              ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
              a versions differ, resolve
             remote created b
             getting b
             merging a
             resolving a
             file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2
 files updated, 1 files merged, 0 files removed, 0 files unresolved
             changeset:   1:802f095af299
             tag:         tip
             user:        test
             date:        Mon Jan 12 13:46:40 1970 +0000
             summary:     2
             resolving manifests
              force None allow None moddirstate True linear True
              ancestor a0c8bcbbb45c local 1165e8bd193e remote a0c8bcbbb45c
             remote deleted b
             removing b
 files updated, 0 files merged, 1 files removed, 0 files unresolved
             changeset:   0:33aaa84a386b
             user:        test
             date:        Mon Jan 12 13:46:40 1970 +0000
             summary:     1
-            abort: there is nothing to merge, just use 'hg update'
+            abort: there is nothing to merge, just use 'hg update' or look at 'hg heads'
             failed
             changeset:   0:33aaa84a386b
             user:        test
             date:        Mon Jan 12 13:46:40 1970 +0000
             summary:     1
             resolving manifests
              force None allow None moddirstate True linear True
              ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
              a versions differ, resolve
             remote created b
             getting b
             merging a
             resolving a
             file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2
 files updated, 1 files merged, 0 files removed, 0 files unresolved
             changeset:   1:802f095af299
             tag:         tip
             user:        test
             date:        Mon Jan 12 13:46:40 1970 +0000
             summary:     2
             changeset:   1:802f095af299cde27a85b2f056aef3829870956c
             tag:         tip
             user:        test
             date:        Mon Jan 12 13:46:40 1970 +0000
             files:       a b
             description:
             changeset:   0:33aaa84a386bd609094aeb21a97c09436c482ef1
             user:        test
             date:        Mon Jan 12 13:46:40 1970 +0000
             files:       a
             description:
             diff -r 802f095af299 a
             --- a/a
             +++ b/a
             @@ -1,1 +1,1 @@ a2
             -a2
             +abc
 files updated, 0 files merged, 1 files removed, 0 files unresolved
             (the addremove command is deprecated; use add and remove --after instead)
             adding b
             M a
             changeset:   1:802f095af299
             user:        test
             date:        Mon Jan 12 13:46:40 1970 +0000
             summary:     2
             resolving manifests
              force None allow None moddirstate True linear False
              ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392
              a versions differ, resolve
              b versions differ, resolve
             this update spans a branch affecting the following files:
              a (resolve)
              b (resolve)
             aborting update spanning branches!
             (use 'hg merge' to merge across branches or 'hg update -C' to lose changes)
             failed
             abort: outstanding uncommitted changes
             failed
             resolving manifests
              force False allow True moddirstate True linear False
              ancestor a0c8bcbbb45c local 1165e8bd193e remote 4096f2872392
              a versions differ, resolve
              b versions differ, resolve
             merging a
             resolving a
             file a: my d730145abbf9 other 13e0d5f949fa ancestor b789fdd96dc2
             merging b
             resolving b
             file b: my 1e88685f5dde other 61de8c7723ca ancestor 000000000000
 files updated, 2 files merged, 0 files removed, 0 files unresolved
             (branch merge, don't forget to commit)
             changeset:   1:802f095af299
             user:        test
             date:        Mon Jan 12 13:46:40 1970 +0000
             summary:     2
             changeset:   2:030602aee63d
             tag:         tip
             parent:      0:33aaa84a386b
             user:        test
             date:        Mon Jan 12 13:46:40 1970 +0000
             summary:     3
             diff -r 802f095af299 a
             --- a/a
             +++ b/a
             @@ -1,1 +1,1 @@ a2
             -a2
             +abc
             adding a
             pulling from ../a
             requesting all changes
             adding changesets
             adding manifests
             adding file changes
             added 1 changesets with 1 changes to 1 files
 files updated, 0 files merged, 0 files removed, 0 files unresolved