Skip to content
  • mpm's avatar
    unify checkout and resolve into update · c03f58e5fd2d
    mpm authored
    -----BEGIN PGP SIGNED MESSAGE-----
    Hash: SHA1
    
    unify checkout and resolve into update
    
    This replaces checkout and resolve with a single command:
    
    $ hg help co
    hg update [node]
    
    update or merge working directory
    
        If there are no outstanding changes in the working directory and
        there is a linear relationship between the current version and the
        requested version, the result is the requested version.
    
        Otherwise the result is a merge between the contents of the
        current working directory and the requested version. Files that
        changed between either parent are marked as changed for the next
        commit and a commit must be performed before any further updates
        are allowed.
    
    manifest hash: 513d285d7fb775d0560de49387042a685ea062f7
    -----BEGIN PGP SIGNATURE-----
    Version: GnuPG v1.4.0 (GNU/Linux)
    
    iD8DBQFComS7ywK+sNU5EO8RAmgRAJ96GA6qvHLy0Jp0fzUrR2os2azPuACePsdC
    YBldZtA7yIuTnV2vIbn7OSE=
    =QtM/
    -----END PGP SIGNATURE-----
    c03f58e5fd2d