[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Forcing commit of an unmodified file?

From: <jhanley_at_dgtlrift.com>
Date: Thu, 21 Aug 2008 10:15:38 -0600

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 <bob_at_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_at_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 <bob_at_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_at_subversion.tigris.org
>>> For additional commands, e-mail: users-help_at_subversion.tigris.org
>>
>>
>>
>>
>> ---------------------------------------------------------------------
>> To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
>> For additional commands, e-mail: users-help_at_subversion.tigris.org
>>
>>

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-08-21 18:16:12 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.