Mercurial > hg-stable
comparison mercurial/commands.py @ 15210:9d8115c5fbda
backout: add a note about not working on merges
| author | Matt Mackall <mpm@selenic.com> |
|---|---|
| date | Sat, 08 Oct 2011 13:28:13 -0500 |
| parents | 10f85a735601 |
| children | 1209de02034e |
comparison
equal
deleted
inserted
replaced
| 15209:10f85a735601 | 15210:9d8115c5fbda |
|---|---|
| 375 current working directory. | 375 current working directory. |
| 376 | 376 |
| 377 If REV is the parent of the working directory, then this new changeset | 377 If REV is the parent of the working directory, then this new changeset |
| 378 is committed automatically. Otherwise, hg needs to merge the | 378 is committed automatically. Otherwise, hg needs to merge the |
| 379 changes and the merged result is left uncommitted. | 379 changes and the merged result is left uncommitted. |
| 380 | |
| 381 .. note:: | |
| 382 backout cannot be used to fix either an unwanted or | |
| 383 incorrect merge. | |
| 380 | 384 |
| 381 .. container:: verbose | 385 .. container:: verbose |
| 382 | 386 |
| 383 By default, the pending changeset will have one parent, | 387 By default, the pending changeset will have one parent, |
| 384 maintaining a linear history. With --merge, the pending | 388 maintaining a linear history. With --merge, the pending |