merg history ?

[Quentin Arce <qa...@yahoo.com>]

Hi.

I have a question about finding the log of a file...
the log of the changes in the branch or what came from
a branch.

So, here is the ?

I svn copy trunk branch

I don't add any files but I edit some.  

check in the branch

I then svn merge branch trunk

Then check in the trunk

Then do a svn log -v --xml on a file under
trunk/file.c

Even though file.c was changed in the branch then the
changes was merged to trunk the hange shows up as a
simple merge or an edit in the trunk directly.

So,.... How do I tell that this change in trunk is a
result of merge from the branch?

I know I can add a note to the change log... but...
how in svn tools?

Thanks,

Q


		
__________________________________ 
Start your day with Yahoo! - Make it your home page! 
http://www.yahoo.com/r/hs

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: merg history ?

[Joshua Varner <jl...@gmail.com>]

On 11/9/05, Ryan Schmidt <su...@ryandesign.com> wrote:
> On Nov 9, 2005, at 19:10, Quentin Arce wrote:
[snip]
> >
> > So,.... How do I tell that this change in trunk is a
> > result of merge from the branch?
> >
> > I know I can add a note to the change log... but...
> > how in svn tools?
>
> As far as I know, you don't. You must note it in the log.
>
Ryan is correct. svn currently doesn't track merges, to svn
they appear the same as any other commit so your commit
messages or a file property will need to keep track of when
and from where you did a merge.

Josh

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org

Re: merg history ?

[Ryan Schmidt <su...@ryandesign.com>]

On Nov 9, 2005, at 19:10, Quentin Arce wrote:

> I have a question about finding the log of a file...
> the log of the changes in the branch or what came from
> a branch.
>
> So, here is the ?
>
> I svn copy trunk branch
>
> I don't add any files but I edit some.
>
> check in the branch
>
> I then svn merge branch trunk
>
> Then check in the trunk
>
> Then do a svn log -v --xml on a file under
> trunk/file.c
>
> Even though file.c was changed in the branch then the
> changes was merged to trunk the hange shows up as a
> simple merge or an edit in the trunk directly.
>
> So,.... How do I tell that this change in trunk is a
> result of merge from the branch?
>
> I know I can add a note to the change log... but...
> how in svn tools?

As far as I know, you don't. You must note it in the log.


---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org