Changes between Version 20 and Version 21 of MercurialBranches


Ignore:
Timestamp:
09/29/11 08:05:17 (3 years ago)
Author:
lukeplant
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • MercurialBranches

    v20 v21  
    2525=== Tips ===
    2626
    27  * Use the [http://mercurial.selenic.com/wiki/BookmarksExtension bookmarks] extension for git-style local feature branches, or named branches for feature branches that you need other people to see.
     27 * Use the [http://mercurial.selenic.com/wiki/BookmarksExtension bookmarks] extension for git-style local feature branches, or named branches for feature branches that you need other people to see. Note that this will effectively block you from pushing '''any''' changes back to Subversion until you have merged the branch and linearised your history, since hgsubversion doesn't support selective pushing of revisions, and, worse, appears to push changes on newly created branches back to trunk, rather than creating new subversion branches.
    2828 * Alternatively, use the [http://mercurial.selenic.com/wiki/MqExtension queues] extension to manage long lived patches.
    2929 * To collapse several commits into a single commit before pushing back to svn, use the [http://mercurial.selenic.com/wiki/HisteditExtension histedit] extension.
Back to Top