Re: svn merge conflicts

Hi Ravi Bavanari,

$ svn status -v httpads/create-advars.js

M 13 13 pgeric httpads/create-advars.js

Thank you

----------------------------------------------------
http://myprojects.srhost.info
eric{at}myprojects{dot}srhost{dot}info
  ----- Original Message -----
  From: Ravi Bavanari
  To: Eric Lee
  Sent: Wednesday, June 25, 2008 4:35 AM
  Subject: Re: svn merge conflicts

  Hi Eric,

  thanks for your reply, i would like to know revision of httpads/create-advars.js
  .working file only.

  Thank you

  On Tue, Jun 24, 2008 at 12:53 PM, Eric Lee <eric_at_myprojects.srhost.info> wrote:

    Hi,

    Did you need finding the revision of all files ?

    if so, please try this

    $ svn status -v

    or

    $ svn status -v -u

    Eric,

    ----------------------------------------------------
    http://myprojects.srhost.info
    eric{at}myprojects{dot}srhost{dot}info
      ----- 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 23:04:22 CEST