[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: svn merge conflicts

From: Eric Lee <eric_at_myprojects.srhost.info>
Date: Wed, 25 Jun 2008 03:53:16 +0800


Did you need finding the revision of all files ?

if so, please try this

$ svn status -v


$ svn status -v -u


  ----- Original Message -----
  From: Ravi Bavanari
  To: users_at_subversion.tigris.org
  Sent: Wednesday, June 25, 2008 3:01 AM
  Subject: svn merge conflicts

  Hi All ,

  can some one help me in explaining in finding what is the revision of this working file as below

  ? httpads/create-advars.js.merge-right.r29843
  ? httpads/create-advars.js.merge-left.r0
  ? httpads/create-advars.js.working
  C httpads/create-advars.js

  Thanks in advanve

  Ravi Bavnari
Received on 2008-06-24 21:53:42 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.