You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Robert William Vesterman <bo...@digitalarts.com> on 2008/08/21 15:18:39 UTC
Forcing commit of an unmodified file?
Is there a way to force a commit to include a file (or directory) that
has not actually been modified?
I would like to do this, for example, when I merge changes from a branch
into the trunk. In that merging revision, the branch isn't changed at
all, but I would still like to mark the branch with the merging
revision's log message, so as to clearly and easily indicate to anyone
browsing the history of that branch that its changes already have been
merged back into the trunk.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Forcing commit of an unmodified file?
Posted by jh...@dgtlrift.com.
I see... that would be useful. It might be possible to do this with a
post-commit-hook. I believe that the latest version tracks the merge
with a rev prop, but I'm not sure what the property name is and if
it's on the merged-to or merged-from side, but the hook could grab
this info and add a human readable property to the merged-from side,
and commit again.
If this is to prevent/inhibit/warn users from accidentally re-merging
the same change from a branch, I thought the latest version took care
of that. If it's just for documentation, the post-commit-hook might
be the immediate option, but it should probably be a feature of the
log command in the future.
Quoting Robert William Vesterman <bo...@digitalarts.com>:
> Well, it's sort of like "stop on copy", but not really, if I understand
> it correctly.
>
> "Stop on copy" shows messages in the branch that was copied /to/. I
> want to show a message in the branch that was merged /from./
>
> jhanley@dgtlrift.com wrote:
>> This sounds like the "stop on copy" feature of svn log. Can it do
>> the same thing for merges, and if it does, would this satisfy what
>> you are trying to accomplish?
>>
>> Quoting Robert William Vesterman <bo...@digitalarts.com>:
>>
>>> Is there a way to force a commit to include a file (or directory) that
>>> has not actually been modified?
>>>
>>> I would like to do this, for example, when I merge changes from a
>>> branch into the trunk. In that merging revision, the branch isn't
>>> changed at all, but I would still like to mark the branch with the
>>> merging revision's log message, so as to clearly and easily indicate to
>>> anyone browsing the history of that branch that its changes already
>>> have been merged back into the trunk.
>>>
>>>
>>> ---------------------------------------------------------------------
>>> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
>>> For additional commands, e-mail: users-help@subversion.tigris.org
>>
>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
>> For additional commands, e-mail: users-help@subversion.tigris.org
>>
>>
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Forcing commit of an unmodified file?
Posted by Robert William Vesterman <bo...@digitalarts.com>.
Well, it's sort of like "stop on copy", but not really, if I understand
it correctly.
"Stop on copy" shows messages in the branch that was copied /to/. I
want to show a message in the branch that was merged /from./
jhanley@dgtlrift.com wrote:
> This sounds like the "stop on copy" feature of svn log. Can it do the
> same thing for merges, and if it does, would this satisfy what you are
> trying to accomplish?
>
> Quoting Robert William Vesterman <bo...@digitalarts.com>:
>
>> Is there a way to force a commit to include a file (or directory) that
>> has not actually been modified?
>>
>> I would like to do this, for example, when I merge changes from a
>> branch into the trunk. In that merging revision, the branch isn't
>> changed at all, but I would still like to mark the branch with the
>> merging revision's log message, so as to clearly and easily indicate to
>> anyone browsing the history of that branch that its changes already
>> have been merged back into the trunk.
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
>> For additional commands, e-mail: users-help@subversion.tigris.org
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
>
>
Re: Forcing commit of an unmodified file?
Posted by jh...@dgtlrift.com.
This sounds like the "stop on copy" feature of svn log. Can it do the
same thing for merges, and if it does, would this satisfy what you are
trying to accomplish?
Quoting Robert William Vesterman <bo...@digitalarts.com>:
> Is there a way to force a commit to include a file (or directory) that
> has not actually been modified?
>
> I would like to do this, for example, when I merge changes from a
> branch into the trunk. In that merging revision, the branch isn't
> changed at all, but I would still like to mark the branch with the
> merging revision's log message, so as to clearly and easily indicate to
> anyone browsing the history of that branch that its changes already
> have been merged back into the trunk.
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: users-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: Forcing commit of an unmodified file?
Posted by Stefan Sperling <st...@elego.de>.
On Thu, Aug 21, 2008 at 11:18:39AM -0400, Robert William Vesterman wrote:
> Is there a way to force a commit to include a file (or directory) that
> has not actually been modified?
>
> I would like to do this, for example, when I merge changes from a branch
> into the trunk. In that merging revision, the branch isn't changed at
> all, but I would still like to mark the branch with the merging
> revision's log message, so as to clearly and easily indicate to anyone
> browsing the history of that branch that its changes already have been
> merged back into the trunk.
If there will be no further development on the branch anyway,
you can just remove it:
svn rm -m "Removing branch, it has been merged into trunk" <url-to-branch>
Then the branch won't show up at all when browsing the latest revision.
It will still be visible in older revisions, of course. But the branch's
last log message can clearly state what happened to it.
Stefan
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org