|
|
49.
|
|
|
Backing out a parent revision is a single step operation
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:180
|
|
|
50.
|
|
|
Backout revision
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:186
|
|
|
51.
|
|
|
Not a head, backout will create a new head!
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:196
|
|
|
55.
|
|
|
Before backout, you must <a href="commit"><b>commit</b></a>, <a href="shelve"><b>shelve</b></a> to patch, or <a href="discard"><b>discard</b></a> changes.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:223
|
|
|
59.
|
|
|
Backing out, then merging...
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:287
|
|
|
60.
|
|
|
All conflicting files will be marked unresolved.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:288 tortoisehg/hgqt/merge.py:347
|
|
|
61.
|
|
|
Automatically advance to next page when backout and merge are complete.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:299
|
|
|
62.
|
|
|
%d files have <b>merge conflicts</b> that must be <a href="resolve"><b>resolved</b></a>
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:327 tortoisehg/hgqt/merge.py:412
|
|
|
74.
|
|
|
Backing out and committing...
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:518
|
|
|
75.
|
|
|
Please wait while making backout.
|
|
|
|
|
(no translation yet)
|
|
|
|
Located in
tortoisehg/hgqt/backout.py:519
|
