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

Re: commit-out of date

From: Troy Curtis Jr <troycurtisjr_at_gmail.com>
Date: Sun, 3 Feb 2008 13:48:31 -0600

On Feb 2, 2008 12:58 AM, Manikanta Kumaraswamy <vizzimani_at_gmail.com> wrote:
> Thanks for reply.
> But my problem is not solved.
> If i "update" my changed file (which is working copy). that is merging with
> latest version.
> so i am getting latest version changes also to my working copy file.
> Actually my aim is i dont want to "commit" with my latest version.
> I want to "commit" with my version r1 form onwards.
>
>
>
> On Feb 2, 2008 12:55 PM, Troy Curtis Jr <troycurtisjr_at_gmail.com> wrote:
>
> >
> >
> >
> > On Feb 1, 2008 10:22 PM, Manikanta Kumaraswamy <vizzimani_at_gmail.com>
> wrote:
> > > Hi i recently started to use svn. My problem is
> > > while committing i am getting out date problem.
> > > My latest version is r6.
> > > My working copy version is r1.
> > > can I commit the changes what ever i did in version r1? And i dont want
> to
> > > update my working copy with latest version r6.
> > > --
> > > Manikanta Kumaraswamy
> >
> > The file (or directory) must be at the revision that the repository
> > version of that "thing" is at. So you HAVE to update. However, you
> > don't have to update everything, you can selectively update individual
> > "things" by specifying their name on the command-line along with 'svn
> > update'. For example:
> >
> > svn update path/to/file.c
> >
> > Troy
> >
> > --
> > "Beware of spyware. If you can, use the Firefox browser." - USA Today
> > Download now at http://getfirefox.com
> > Registered Linux User #354814 ( http://counter.li.org/)
> >
>
>
>
> --
> Manikanta Kumaraswamy

First off try to remember to always "Reply-All" so that a copy gets
sent to the list for everyone else to see also. (I constantly forget
myself).

I think I understand what you are saying. You don't want to merge
your changes with the latest version, you want to replace what is in
the repo with your changes. To do this you need to

1. make a backup copy of your file,
2. update the file using 'svn update'
3. copy your backed up file over the top of the now up-to-date file
from the repo,
4. Now you are ready to commit.

The reason you must do this is becauses of Subversion's method for
making sure you don't unknowingly blow away other people's changes.
You can't commit until you have updated to the latest version of that
file. After you have the latest version you are then free to make and
commit whatever changes you made, but at least you should be aware of
what other people may have done to that file.

Troy

-- 
"Beware of spyware. If you can, use the Firefox browser." - USA Today
Download now at http://getfirefox.com
Registered Linux User #354814 ( http://counter.li.org/)
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-02-03 20:48:49 CET

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.