On Wed, 2008-11-19 at 18:17 -0500, Bob Archer wrote:
> You can do a reverse merge. Or, you can just delete trunk and copy your
> tag to trunk.
>
> BOb
>
>
Deleting and copying is simpler, but the history trail is less clear.
A reverse merge can contain a log entry which explains what is
happening, and dosn't twist the trunk line around.
Tony Butt
CEA Technologies
Canberra, Australia
> -----Original Message-----
> From: Robert Landrum [mailto:Robert.Landrum_at_corp.aol.com]
> Sent: Wednesday, November 19, 2008 6:13 PM
> To: users_at_subversion.tigris.org
> Subject: Tagging and Merging and Rollback
>
> I'm a new SVN user and come from the usual CVS world.
>
> I'm pretty clear on the tagging-is-a-copy thing, but not so clear on how
>
> to reference the tag in my merging and rollback commands.
>
> For instance, I check in changes to the trunk. After checking in, I
> create a tag of the trunk called foo-1.1-1.
>
> I check in some broken files into the trunk. I no longer want anything
> I checked into the trunk, and would prefer to replace the contents of
> trunk with tag foo-1.1-1.
>
> For all my googling, I have yet to find a succinct way to perform this
> action. Instead, I must find the revision number of the foo-1.1-1 tag,
> then the revision number of the trunk, and do a reverse merge on the
> trunk with -r $TRUNKREV:$FOOREV.
>
> Is there an easier way to perform what I want, perhaps without doing a
> merge?
>
> Rob
>
>
>
> ---------------------------------------------------------------------
> 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-11-20 03:46:48 CET