I'm not sure I understood your question, but here's a guess at an
answer:
Subversion doesn't record merge history yet. That feature is planned
for after 1.0; see `notes/repeated-merge' for some recent thoughts.
-Karl
"Roman Rytov" <rrytov@entopia.com> writes:
> I found that on a branched version's log it's possible to guess that the
> next snippet reflects branching (namely from servers/css to servers/css3
> :
>
> <logentry revision="42">
> <author>anonymous</author>
> <date>2002-12-25T23:25:08.835687Z</date>
> <paths>
> <path copyfrom-path="/servers/css"
> copyfrom-rev="41" action="A">/servers/css3</path>
> </paths>
> <msg>branch?</msg>
> </logentry>
>
>
>
> But I see no way to get info from a log after merging. Since merge is a
> client-oriented command the server knows nothing where the modified file
> came from, correct?
>
> So the question is about tracing the whole picture. If a general trunk
> became branched and at some point I wanna merge the branch back to the
> trunk then I wouldn't be able to trace merging from the log (though
> branching seems to me I would). I missed something?
>
>
> A short example:
>
> A is a trunk rev.#1
> A1 is its branch (result of COPY) rev.#2
> A1 is changed rev#3
> A1 is merged to A and commited rev#4
>
> Now from the log I see where A1 came from but I don't where it gets to.
>
> RR
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: dev-help@subversion.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Dec 26 00:56:19 2002