Re: Update the branch from main trunk

On 11/06/07, max payne <max_paynetrap@yahoo.com> wrote:
> Hi,
> I have gone through subversion book.
> but i couldn't find the solution. Let me clearly explain the problem.
> As i want to update my branch from main trunk
> steps:
> 1) I Merged the main trunk with branch.
> 2) In result window i got few conflict files which i resolve using "resolve
> using their" option.
> But when i see the log it is displaying me the last updated date but not
> latest update date.

The merge has occurred in your working copy. The log shows what is in
the repository. Until you commit the changes to your WC you will not
see any change in the log.

Again, please keep this discussion on the list, not to my personal
email address.

Simon

-- 
       ___
  oo  // \\      "De Chelonian Mobile"
 (_,\/ \_/ \     TortoiseSVN
   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
   /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org