upstream/mercurial-mirror Commit - r11113:db6f3a97

1

% first revision, no sub

1

% first revision, no sub

2

adding a

2

adding a

3

% add first sub

3

% add first sub

4

adding a

4

adding a

5

parent: 0:f7b1eb17ad24 tip

5

parent: 0:f7b1eb17ad24 tip

6

0

6

0

7

branch: default

7

branch: default

8

commit: 1 added, 1 subrepos

8

commit: 1 added, 1 subrepos

9

update: (current)

9

update: (current)

10

committing subrepository s

10

committing subrepository s

11

% add sub sub

11

% add sub sub

12

parent: 1:7cf8cfea66e4 tip

12

parent: 1:7cf8cfea66e4 tip

13

1

13

1

14

branch: default

14

branch: default

15

commit: 1 subrepos

15

commit: 1 subrepos

16

update: (current)

16

update: (current)

17

committing subrepository s

17

committing subrepository s

18

committing subrepository ss

18

committing subrepository s/ss

19

parent: 2:df30734270ae tip

19

parent: 2:df30734270ae tip

20

2

20

2

21

branch: default

21

branch: default

22

commit: (clean)

22

commit: (clean)

23

update: (current)

23

update: (current)

24

% bump sub rev

24

% bump sub rev

25

committing subrepository s

25

committing subrepository s

26

% leave sub dirty

26

% leave sub dirty

27

committing subrepository s

27

committing subrepository s

28

changeset: 3:1c833a7a9e3a

28

changeset: 3:1c833a7a9e3a

29

tag: tip

29

tag: tip

30

user: test

30

user: test

31

date: Thu Jan 01 00:00:00 1970 +0000

31

date: Thu Jan 01 00:00:00 1970 +0000

32

summary: 4

32

summary: 4

33

34

% check caching

34

% check caching

35

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

35

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

36

% restore

36

% restore

37

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

37

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

38

path s

38

path s

39

source s

39

source s

40

revision 1c833a7a9e3a4445c711aaf0f012379cd0d4034e

40

revision 1c833a7a9e3a4445c711aaf0f012379cd0d4034e

41

% new branch for merge tests

41

% new branch for merge tests

42

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

42

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

43

adding t/t

43

adding t/t

44

% 5

44

% 5

45

committing subrepository t

45

committing subrepository t

46

created new head

46

created new head

47

% 6

47

% 6

48

committing subrepository t

48

committing subrepository t

49

path s

49

path s

50

source s

50

source s

51

revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4

51

revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4

52

path t

52

path t

53

source t

53

source t

54

revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad

54

revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad

55

% 7

55

% 7

56

committing subrepository t

56

committing subrepository t

57

% 8

57

% 8

58

% merge tests

58

% merge tests

59

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

59

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

60

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

60

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

61

(branch merge, don't forget to commit)

61

(branch merge, don't forget to commit)

62

path s

62

path s

63

source s

63

source s

64

revision fc627a69481fcbe5f1135069e8a3881c023e4cf5

64

revision fc627a69481fcbe5f1135069e8a3881c023e4cf5

65

path t

65

path t

66

source t

66

source t

67

revision 60ca1237c19474e7a3978b0dc1ca4e6f36d51382

67

revision 60ca1237c19474e7a3978b0dc1ca4e6f36d51382

68

created new head

68

created new head

69

searching for copies back to rev 2

69

searching for copies back to rev 2

70

resolving manifests

70

resolving manifests

71

overwrite None partial False

71

overwrite None partial False

72

ancestor 1f14a2e2d3ec local f0d2028bf86d+ remote 1831e14459c4

72

ancestor 1f14a2e2d3ec local f0d2028bf86d+ remote 1831e14459c4

73

.hgsubstate: versions differ -> m

73

.hgsubstate: versions differ -> m

74

update: .hgsubstate 1/1 files (100.00%)

74

update: .hgsubstate 1/1 files (100.00%)

75

subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec

75

subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec

76

subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg

76

subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg

77

getting subrepo t

77

getting subrepo t

78

resolving manifests

78

resolving manifests

79

overwrite True partial False

79

overwrite True partial False

80

ancestor 60ca1237c194+ local 60ca1237c194+ remote 6747d179aa9a

80

ancestor 60ca1237c194+ local 60ca1237c194+ remote 6747d179aa9a

81

t: remote is newer -> g

81

t: remote is newer -> g

82

update: t 1/1 files (100.00%)

82

update: t 1/1 files (100.00%)

83

getting t

83

getting t

84

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

84

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

85

(branch merge, don't forget to commit)

85

(branch merge, don't forget to commit)

86

path s

86

path s

87

source s

87

source s

88

revision fc627a69481fcbe5f1135069e8a3881c023e4cf5

88

revision fc627a69481fcbe5f1135069e8a3881c023e4cf5

89

path t

89

path t

90

source t

90

source t

91

revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad

91

revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad

92

committing subrepository t

92

committing subrepository t

93

searching for copies back to rev 2

93

searching for copies back to rev 2

94

resolving manifests

94

resolving manifests

95

overwrite None partial False

95

overwrite None partial False

96

ancestor 1831e14459c4 local e45c8b14af55+ remote f94576341bcf

96

ancestor 1831e14459c4 local e45c8b14af55+ remote f94576341bcf

97

.hgsubstate: versions differ -> m

97

.hgsubstate: versions differ -> m

98

update: .hgsubstate 1/1 files (100.00%)

98

update: .hgsubstate 1/1 files (100.00%)

99

subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4

99

subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4

100

subrepo t: both sides changed, merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg

100

subrepo t: both sides changed, merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg

101

merging subrepo t

101

merging subrepo t

102

searching for copies back to rev 2

102

searching for copies back to rev 2

103

resolving manifests

103

resolving manifests

104

overwrite None partial False

104

overwrite None partial False

105

ancestor 6747d179aa9a local 20a0db6fbf6c+ remote 7af322bc1198

105

ancestor 6747d179aa9a local 20a0db6fbf6c+ remote 7af322bc1198

106

t: versions differ -> m

106

t: versions differ -> m

107

preserving t for resolve of t

107

preserving t for resolve of t

108

update: t 1/1 files (100.00%)

108

update: t 1/1 files (100.00%)

109

picked tool 'internal:merge' for t (binary False symlink False)

109

picked tool 'internal:merge' for t (binary False symlink False)

110

merging t

110

merging t

111

my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a

111

my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a

112

warning: conflicts during merge.

112

warning: conflicts during merge.

113

merging t failed!

113

merging t failed!

114

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

114

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

115

use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon

115

use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon

116

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

116

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

117

(branch merge, don't forget to commit)

117

(branch merge, don't forget to commit)

118

% should conflict

118

% should conflict

119

<<<<<<< local

119

<<<<<<< local

120

conflict

120

conflict

121

=======

121

=======

122

t3

122

t3

123

>>>>>>> other

123

>>>>>>> other

124

% clone

124

% clone

125

updating to branch default

125

updating to branch default

126

pulling subrepo s from .../sub/t/s

126

pulling subrepo s from .../sub/t/s

127

requesting all changes

127

requesting all changes

128

adding changesets

128

adding changesets

129

adding manifests

129

adding manifests

130

adding file changes

130

adding file changes

131

added 4 changesets with 5 changes to 3 files

131

added 4 changesets with 5 changes to 3 files

132

pulling subrepo s/ss from .../sub/t/s/ss

132

pulling subrepo s/ss from .../sub/t/s/ss

133

requesting all changes

133

requesting all changes

134

adding changesets

134

adding changesets

135

adding manifests

135

adding manifests

136

adding file changes

136

adding file changes

137

added 1 changesets with 1 changes to 1 files

137

added 1 changesets with 1 changes to 1 files

138

pulling subrepo t from .../sub/t/t

138

pulling subrepo t from .../sub/t/t

139

requesting all changes

139

requesting all changes

140

adding changesets

140

adding changesets

141

adding manifests

141

adding manifests

142

adding file changes

142

adding file changes

143

added 4 changesets with 4 changes to 1 files (+1 heads)

143

added 4 changesets with 4 changes to 1 files (+1 heads)

144

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

144

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

145

path s

145

path s

146

source s

146

source s

147

revision fc627a69481fcbe5f1135069e8a3881c023e4cf5

147

revision fc627a69481fcbe5f1135069e8a3881c023e4cf5

148

path t

148

path t

149

source t

149

source t

150

revision 20a0db6fbf6c3d2836e6519a642ae929bfc67c0e

150

revision 20a0db6fbf6c3d2836e6519a642ae929bfc67c0e

151

% push

151

% push

152

committing subrepository t

152

committing subrepository t

153

pushing ...sub/t

153

pushing ...sub/t

154

pushing ...sub/t/s/ss

154

pushing ...sub/t/s/ss

155

searching for changes

155

searching for changes

156

no changes found

156

no changes found

157

pushing ...sub/t/s

157

pushing ...sub/t/s

158

searching for changes

158

searching for changes

159

no changes found

159

no changes found

160

pushing ...sub/t/t

160

pushing ...sub/t/t

161

searching for changes

161

searching for changes

162

adding changesets

162

adding changesets

163

adding manifests

163

adding manifests

164

adding file changes

164

adding file changes

165

added 1 changesets with 1 changes to 1 files

165

added 1 changesets with 1 changes to 1 files

166

searching for changes

166

searching for changes

167

adding changesets

167

adding changesets

168

adding manifests

168

adding manifests

169

adding file changes

169

adding file changes

170

added 1 changesets with 1 changes to 1 files

170

added 1 changesets with 1 changes to 1 files

171

% push -f

171

% push -f

172

committing subrepository s

172

committing subrepository s

173

abort: push creates new remote heads on branch 'default'!

173

abort: push creates new remote heads on branch 'default'!

174

pushing ...sub/t

174

pushing ...sub/t

175

pushing ...sub/t/s/ss

175

pushing ...sub/t/s/ss

176

searching for changes

176

searching for changes

177

no changes found

177

no changes found

178

pushing ...sub/t/s

178

pushing ...sub/t/s

179

searching for changes

179

searching for changes

180

(did you forget to merge? use push -f to force)

180

(did you forget to merge? use push -f to force)

181

pushing ...sub/t

181

pushing ...sub/t

182

pushing ...sub/t/s/ss

182

pushing ...sub/t/s/ss

183

searching for changes

183

searching for changes

184

no changes found

184

no changes found

185

pushing ...sub/t/s

185

pushing ...sub/t/s

186

searching for changes

186

searching for changes

187

adding changesets

187

adding changesets

188

adding manifests

188

adding manifests

189

adding file changes

189

adding file changes

190

added 1 changesets with 1 changes to 1 files (+1 heads)

190

added 1 changesets with 1 changes to 1 files (+1 heads)

191

pushing ...sub/t/t

191

pushing ...sub/t/t

192

searching for changes

192

searching for changes

193

no changes found

193

no changes found

194

searching for changes

194

searching for changes

195

adding changesets

195

adding changesets

196

adding manifests

196

adding manifests

197

adding file changes

197

adding file changes

198

added 1 changesets with 1 changes to 1 files

198

added 1 changesets with 1 changes to 1 files

199

% update

199

% update

200

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

200

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

201

committing subrepository t

201

committing subrepository t

202

% pull

202

% pull

203

pulling ...sub/t

203

pulling ...sub/t

204

searching for changes

204

searching for changes

205

adding changesets

205

adding changesets

206

adding manifests

206

adding manifests

207

adding file changes

207

adding file changes

208

added 1 changesets with 1 changes to 1 files

208

added 1 changesets with 1 changes to 1 files

209

(run 'hg update' to get a working copy)

209

(run 'hg update' to get a working copy)

210

pulling subrepo t from .../sub/t/t

210

pulling subrepo t from .../sub/t/t

211

searching for changes

211

searching for changes

212

adding changesets

212

adding changesets

213

adding manifests

213

adding manifests

214

adding file changes

214

adding file changes

215

added 1 changesets with 1 changes to 1 files

215

added 1 changesets with 1 changes to 1 files

216

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

216

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

217

blah

217

blah

218

% bogus subrepo path aborts

218

% bogus subrepo path aborts

219

abort: missing ] in subrepo source

219

abort: missing ] in subrepo source

220

% issue 1986

220

% issue 1986

221

adding a

221

adding a

222

marked working directory as branch br

222

marked working directory as branch br

223

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

223

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

224

adding b

224

adding b

225

created new head

225

created new head

226

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

226

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

227

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

227

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

228

(branch merge, don't forget to commit)

228

(branch merge, don't forget to commit)

229

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

229

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

230

adding c

230

adding c

231

created new head

231

created new head

232

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

232

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

233

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

233

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

234

(branch merge, don't forget to commit)

234

(branch merge, don't forget to commit)

235

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

235

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

236

adding .hgsub

236

adding .hgsub

237

committing subrepository s

237

committing subrepository s

238

marked working directory as branch br

238

marked working directory as branch br

239

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

239

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

240

adding b

240

adding b

241

committing subrepository s

241

committing subrepository s

242

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

242

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

243

adding c

243

adding c

244

created new head

244

created new head

245

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

245

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

246

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

246

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

247

(branch merge, don't forget to commit)

247

(branch merge, don't forget to commit)

248

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

248

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

249

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

249

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

250

adding d

250

adding d

251

committing subrepository s

251

committing subrepository s

252

created new head

252

created new head

253

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

253

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

254

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

254

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

255

adding e

255

adding e

256

committing subrepository s

256

committing subrepository s

257

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

257

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

258

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

258

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

259

(branch merge, don't forget to commit)

259

(branch merge, don't forget to commit)

260

% test subrepo delete from .hgsubstate

260

% test subrepo delete from .hgsubstate

261

adding testdelete/nested/foo

261

adding testdelete/nested/foo

262

adding testdelete/nested2/foo

262

adding testdelete/nested2/foo

263

adding testdelete/.hgsub

263

adding testdelete/.hgsub

264

committing subrepository nested2

264

committing subrepository nested2

265

committing subrepository nested

265

committing subrepository nested

266

nested

266

nested

267

% test repository cloning

267

% test repository cloning

268

adding nested_absolute/foo

268

adding nested_absolute/foo

269

adding nested_relative/foo2

269

adding nested_relative/foo2

270

adding main/.hgsub

270

adding main/.hgsub

271

committing subrepository nested_relative

271

committing subrepository nested_relative

272

committing subrepository nested_absolute

272

committing subrepository nested_absolute

273

updating to branch default

273

updating to branch default

274

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

274

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

275

[paths]

275

[paths]

276

default = $HGTMP/test-subrepo/sub/mercurial/nested_absolute

276

default = $HGTMP/test-subrepo/sub/mercurial/nested_absolute

277

[paths]

277

[paths]

278

default = $HGTMP/test-subrepo/sub/mercurial/nested_relative

278

default = $HGTMP/test-subrepo/sub/mercurial/nested_relative

279

% issue 1977

279

% issue 1977

280

adding a

280

adding a

281

adding .hgsub

281

adding .hgsub

282

committing subrepository s

282

committing subrepository s

283

updating to branch default

283

updating to branch default

284

pulling subrepo s from .../sub/repo/s

284

pulling subrepo s from .../sub/repo/s

285

requesting all changes

285

requesting all changes

286

adding changesets

286

adding changesets

287

adding manifests

287

adding manifests

288

adding file changes

288

adding file changes

289

added 1 changesets with 1 changes to 1 files

289

added 1 changesets with 1 changes to 1 files

290

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

290

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

291

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

291

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

292

created new head

292

created new head

293

committing subrepository s

293

committing subrepository s

294

abort: push creates new remote heads on branch 'default'!

294

abort: push creates new remote heads on branch 'default'!

295

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

295

0 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

             % first revision, no sub
             adding a
             % add first sub
             adding a
             parent: 0:f7b1eb17ad24 tip
             branch: default
             commit: 1 added, 1 subrepos
             update: (current)
             committing subrepository s
             % add sub sub
             parent: 1:7cf8cfea66e4 tip
             branch: default
             commit: 1 subrepos
             update: (current)
             committing subrepository s
-            committing subrepository ss
+            committing subrepository s/ss
             parent: 2:df30734270ae tip
             branch: default
             commit: (clean)
             update: (current)
             % bump sub rev
             committing subrepository s
             % leave sub dirty
             committing subrepository s
             changeset:   3:1c833a7a9e3a
             tag:         tip
             user:        test
             date:        Thu Jan 01 00:00:00 1970 +0000
             summary:     4
             % check caching
 files updated, 0 files merged, 2 files removed, 0 files unresolved
             % restore
 files updated, 0 files merged, 0 files removed, 0 files unresolved
             path s
              source   s
              revision 1c833a7a9e3a4445c711aaf0f012379cd0d4034e
             % new branch for merge tests
 files updated, 0 files merged, 0 files removed, 0 files unresolved
             adding t/t
             % 5
             committing subrepository t
             created new head
             % 6
             committing subrepository t
             path s
              source   s
              revision e4ece1bf43360ddc8f6a96432201a37b7cd27ae4
             path t
              source   t
              revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad
             % 7
             committing subrepository t
             % 8
             % merge tests
 files updated, 0 files merged, 0 files removed, 0 files unresolved
 files updated, 0 files merged, 0 files removed, 0 files unresolved
             (branch merge, don't forget to commit)
             path s
              source   s
              revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
             path t
              source   t
              revision 60ca1237c19474e7a3978b0dc1ca4e6f36d51382
             created new head
               searching for copies back to rev 2
             resolving manifests
              overwrite None partial False
              ancestor 1f14a2e2d3ec local f0d2028bf86d+ remote 1831e14459c4
              .hgsubstate: versions differ -> m
             update: .hgsubstate 1/1 files (100.00%)
             subrepo merge f0d2028bf86d+ 1831e14459c4 1f14a2e2d3ec
               subrepo t: other changed, get t:6747d179aa9a688023c4b0cad32e4c92bb7f34ad:hg
             getting subrepo t
             resolving manifests
              overwrite True partial False
              ancestor 60ca1237c194+ local 60ca1237c194+ remote 6747d179aa9a
              t: remote is newer -> g
             update: t 1/1 files (100.00%)
             getting t
 files updated, 0 files merged, 0 files removed, 0 files unresolved
             (branch merge, don't forget to commit)
             path s
              source   s
              revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
             path t
              source   t
              revision 6747d179aa9a688023c4b0cad32e4c92bb7f34ad
             committing subrepository t
               searching for copies back to rev 2
             resolving manifests
              overwrite None partial False
              ancestor 1831e14459c4 local e45c8b14af55+ remote f94576341bcf
              .hgsubstate: versions differ -> m
             update: .hgsubstate 1/1 files (100.00%)
             subrepo merge e45c8b14af55+ f94576341bcf 1831e14459c4
               subrepo t: both sides changed, merge with t:7af322bc1198a32402fe903e0b7ebcfc5c9bf8f4:hg
             merging subrepo t
               searching for copies back to rev 2
             resolving manifests
              overwrite None partial False
              ancestor 6747d179aa9a local 20a0db6fbf6c+ remote 7af322bc1198
              t: versions differ -> m
             preserving t for resolve of t
             update: t 1/1 files (100.00%)
             picked tool 'internal:merge' for t (binary False symlink False)
             merging t
             my t@20a0db6fbf6c+ other t@7af322bc1198 ancestor t@6747d179aa9a
             warning: conflicts during merge.
             merging t failed!
 files updated, 0 files merged, 0 files removed, 1 files unresolved
             use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
 files updated, 0 files merged, 0 files removed, 0 files unresolved
             (branch merge, don't forget to commit)
             % should conflict
             <<<<<<< local
             conflict
             =======
             t3
             >>>>>>> other
             % clone
             updating to branch default
             pulling subrepo s from .../sub/t/s
             requesting all changes
             adding changesets
             adding manifests
             adding file changes
             added 4 changesets with 5 changes to 3 files
             pulling subrepo s/ss from .../sub/t/s/ss
             requesting all changes
             adding changesets
             adding manifests
             adding file changes
             added 1 changesets with 1 changes to 1 files
             pulling subrepo t from .../sub/t/t
             requesting all changes
             adding changesets
             adding manifests
             adding file changes
             added 4 changesets with 4 changes to 1 files (+1 heads)
 files updated, 0 files merged, 0 files removed, 0 files unresolved
             path s
              source   s
              revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
             path t
              source   t
              revision 20a0db6fbf6c3d2836e6519a642ae929bfc67c0e
             % push
             committing subrepository t
             pushing ...sub/t
             pushing ...sub/t/s/ss
             searching for changes
             no changes found
             pushing ...sub/t/s
             searching for changes
             no changes found
             pushing ...sub/t/t
             searching for changes
             adding changesets
             adding manifests
             adding file changes
             added 1 changesets with 1 changes to 1 files
             searching for changes
             adding changesets
             adding manifests
             adding file changes
             added 1 changesets with 1 changes to 1 files
             % push -f
             committing subrepository s
             abort: push creates new remote heads on branch 'default'!
             pushing ...sub/t
             pushing ...sub/t/s/ss
             searching for changes
             no changes found
             pushing ...sub/t/s
             searching for changes
             (did you forget to merge? use push -f to force)
             pushing ...sub/t
             pushing ...sub/t/s/ss
             searching for changes
             no changes found
             pushing ...sub/t/s
             searching for changes
             adding changesets
             adding manifests
             adding file changes
             added 1 changesets with 1 changes to 1 files (+1 heads)
             pushing ...sub/t/t
             searching for changes
             no changes found
             searching for changes
             adding changesets
             adding manifests
             adding file changes
             added 1 changesets with 1 changes to 1 files
             % update
 files updated, 0 files merged, 0 files removed, 0 files unresolved
             committing subrepository t
             % pull
             pulling ...sub/t
             searching for changes
             adding changesets
             adding manifests
             adding file changes
             added 1 changesets with 1 changes to 1 files
             (run 'hg update' to get a working copy)
             pulling subrepo t from .../sub/t/t
             searching for 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
             blah
             % bogus subrepo path aborts
             abort: missing ] in subrepo source
             % issue 1986
             adding a
             marked working directory as branch br
 files updated, 0 files merged, 0 files removed, 0 files unresolved
             adding b
             created new head
 files updated, 0 files merged, 1 files removed, 0 files unresolved
 files updated, 0 files merged, 0 files removed, 0 files unresolved
             (branch merge, don't forget to commit)
 files updated, 0 files merged, 0 files removed, 0 files unresolved
             adding c
             created new head
 files updated, 0 files merged, 1 files removed, 0 files unresolved
 files updated, 0 files merged, 0 files removed, 0 files unresolved
             (branch merge, don't forget to commit)
 files updated, 0 files merged, 1 files removed, 0 files unresolved
             adding .hgsub
             committing subrepository s
             marked working directory as branch br
 files updated, 0 files merged, 0 files removed, 0 files unresolved
             adding b
             committing subrepository s
 files updated, 0 files merged, 1 files removed, 0 files unresolved
             adding c
             created new head
 files updated, 0 files merged, 1 files removed, 0 files unresolved
 files updated, 0 files merged, 0 files removed, 0 files unresolved
             (branch merge, don't forget to commit)
 files updated, 0 files merged, 1 files removed, 0 files unresolved
 files updated, 0 files merged, 0 files removed, 0 files unresolved
             adding d
             committing subrepository s
             created new head
 files updated, 0 files merged, 1 files removed, 0 files unresolved
 files updated, 0 files merged, 0 files removed, 0 files unresolved
             adding e
             committing subrepository s
 files updated, 0 files merged, 0 files removed, 0 files unresolved
 files updated, 0 files merged, 0 files removed, 0 files unresolved
             (branch merge, don't forget to commit)
             % test subrepo delete from .hgsubstate
             adding testdelete/nested/foo
             adding testdelete/nested2/foo
             adding testdelete/.hgsub
             committing subrepository nested2
             committing subrepository nested
             nested
             % test repository cloning
             adding nested_absolute/foo
             adding nested_relative/foo2
             adding main/.hgsub
             committing subrepository nested_relative
             committing subrepository nested_absolute
             updating to branch default
 files updated, 0 files merged, 0 files removed, 0 files unresolved
             [paths]
             default = $HGTMP/test-subrepo/sub/mercurial/nested_absolute
             [paths]
             default = $HGTMP/test-subrepo/sub/mercurial/nested_relative
             % issue 1977
             adding a
             adding .hgsub
             committing subrepository s
             updating to branch default
             pulling subrepo s from .../sub/repo/s
             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
 files updated, 0 files merged, 0 files removed, 0 files unresolved
             created new head
             committing subrepository s
             abort: push creates new remote heads on branch 'default'!
 files updated, 0 files merged, 0 files removed, 0 files unresolved