Merge tracking question

[Chuck Holzwarth <ch...@yahoo.com>]

I just started on a project where the company implemented subversion 1.5 and imported files directly instead of importing their old vss repository. Changes have been made over the past few weeks and I created a branch from an old revision. I am now cherry picking files to megre to that branch. After I do a merge and commit, I don't see the history of where the code I merged came from. Subversion is implemented so old clients can't access the repository. I get the same behavior with subclipse and tortoise. I downloaded the latest builds of both subclipse and tortoise yesterday before starting my work.

I thought that the merge tracking would show where a change came from and which revisions it included. Am I wrong, or is there a bug in the version that is running?

svn --version
svn, version 1.5.4 (r33841)
   compiled Oct 23 2008, 08:54:42

 Thank you,
Chuck Holzwarth
Independent IT Consultant
(804) 403-3478 (home)
(804) 305-4040 (cell)

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1010483

To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].

RE: Merge tracking question

[Bob Archer <Bo...@amsi.com>]

See

 

http://svnbook.red-bean.com/en/1.5/svn-book.html#svn.branchmerge.basicme
rging.mergeinfo

 

You should see the mergeinfo properties in your target folder/files.

 

BOb

 

 

________________________________

From: Chuck Holzwarth [mailto:chuck_holzwarth@yahoo.com] 
Sent: Wednesday, January 07, 2009 3:40 PM
To: users@subversion.tigris.org
Subject: Merge tracking question

 

I just started on a project where the company implemented subversion 1.5
and imported files directly instead of importing their old vss
repository. Changes have been made over the past few weeks and I created
a branch from an old revision. I am now cherry picking files to megre to
that branch. After I do a merge and commit, I don't see the history of
where the code I merged came from. Subversion is implemented so old
clients can't access the repository. I get the same behavior with
subclipse and tortoise. I downloaded the latest builds of both subclipse
and tortoise yesterday before starting my work.

I thought that the merge tracking would show where a change came from
and which revisions it included. Am I wrong, or is there a bug in the
version that is running?

svn --version
svn, version 1.5.4 (r33841)
   compiled Oct 23 2008, 08:54:42

 

Thank you,
Chuck Holzwarth
Independent IT Consultant
(804) 403-3478 (home)
(804) 305-4040 (cell)

------------------------------------------------------
http://subversion.tigris.org/ds/viewMessage.do?dsForumId=1065&dsMessageId=1010495

To unsubscribe from this discussion, e-mail: [users-unsubscribe@subversion.tigris.org].