how to push selected changes only?
Steve Barnes
gadgetsteve at hotmail.com
Sat Jan 18 17:00:36 UTC 2014
On 18/01/14 15:23, hamann.w at t-online.de wrote:
>
> Hi,
>
> I have come to a point in a project where I wanted to keep a stable / reference version,
> so I cloned the repo and started to experiment on new stuff. At that point I stumbled across
> a few problems that I would like to see fixed in the reference version too.
> These fixes can be expressed either as specific filenames or as specific revision
> numbers. Hg push will accept only a single reviosion number.
> Is there any way to send them back? If not, I would probably have to send
> the modified files as they are now (and have revisions compressed into one step)
>
> Regards
> Wolfgang Hamann
>
>
> _______________________________________________
> Mercurial mailing list
> Mercurial at selenic.com
> http://selenic.com/mailman/listinfo/mercurial
>
>
If you are working on branches you can merge your changes back into the
trunk, (default branch), on your original repository, possibly cherry
picking as you go.
If you are on a true clone of the repository you would need to *graft*
your changes on - to quote the help:
~$ hg --help graft
hg graft [OPTION]... [-r] REV...
copy changes from other branches onto the current branch
This command uses Mercurial's merge logic to copy individual
changes from
other branches without merging branches in the history graph. This is
sometimes known as 'backporting' or 'cherry-picking'. By default, graft
will copy user, date, and description from the source changesets.
Changesets that are ancestors of the current revision, that have
already
been grafted, or that are merges will be skipped.
If --log is specified, log messages will have a comment appended of the
form:
(grafted from CHANGESETHASH)
If a graft merge results in conflicts, the graft process is
interrupted so
that the current merge can be manually resolved. Once all conflicts are
addressed, the graft process can be continued with the -c/--continue
option.
Note:
The -c/--continue option does not reapply earlier options.
Returns 0 on successful completion.
options:
-r --rev REV [+] revisions to graft
-c --continue resume interrupted graft
-e --edit invoke editor on commit messages
--log append graft info to log message
-D --currentdate record the current date as commit date
-U --currentuser record the current user as committer
-d --date DATE record the specified date as commit date
-u --user USER record the specified user as committer
-t --tool VALUE specify merge tool
-n --dry-run do not perform actions, just print output
--mq operate on patch repository
[+] marked option can be specified multiple times
use "hg -v help graft" to show more complete help and the global options
Hope that helps:
Gadget/Steve
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20140118/a80690d3/attachment-0002.html>
More information about the Mercurial
mailing list