RE: Bug in automerge -- probably not

The problem isn't that Undo didn't merge correctly, but simply that the
default for Undo Checkout is to leave the file as is, without reverting b=
ack
to the baseline file.   You can change the default setting via the option=
s
dialog.  Also, in the GUI client, the option is part of the Undo command
dialog.  In the IDE client, it is part of the "advanced" options provided=
 by
Visual Studio - in some IDE versions this is located in the top left corn=
er
of the dialog.

-Dan

> -----Original Message-----
> From: [email protected]
> [mailto:[email protected]]On Behalf Of John Saunder=
s
> Sent: Wednesday, April 07, 2004 1:12 PM
> To: 'Vault-List (E-mail)'
> Subject: RE: [vault-list] Bug in automerge -- probably not
>
>
> More info. Earlier today, a changed a file and then decided to do an "U=
ndo
> Checkout" on it. I just noticed in the GUI client that the file was mar=
ked
> as Renegade. I did a Show Differences and noticed that the difference w=
as
> the difference I was trying to back out! Apparently, the "Undo Checkout=
"
> failed to properly auto merge the version in the repository?
>
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> John Saunders=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 E-m=
ail: [email protected]
> Internet Engineer=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=
=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 Tel: +1 508 621 3818
> WWW: www.surfcontrol.com=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=
=A0=A0=A0=A0=A0=A0=A0=A0 Fax: +1 508 621 3921
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> =A0=A0=A0=A0=A0 SurfControl - the World's #1 Web & E-mail Filtering Com=
pany
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
>
>
> -----Original Message-----
> From: John Saunders
> Sent: Wednesday, March 31, 2004 17:50
> To: 'Vault-List (E-mail)'
> Subject: RE: [vault-list] Bug in automerge -- probably not
>
> It seems that I replied incorrectly before:
> ------------
> I see this problem very frequently. I think it may have to do with maki=
ng
> changes while working offline. I use my laptop as my primary developmen=
t
> machine.
>
> The workaround is to use the Status Search to check for any file in the
> project that is not in the "Normal" state, and to treat it appropriatel=
y.
> The usual thing is to have Renegade files. I then have to do a
> Check Out and
> Check In. To solve problems with Old files, I do a Shift-Get Latest and
> select Overwrite.
>
> Works every time.
>
> This is with Vault 1.2.3(758).
> --------------
>
> The new news is that it happened just now. I just opened a solution on =
a
> machine that hadn't opened it for weeks. Naturally, what was on
> disk was not
> the latest. I selected the solution in Solution Explorer and did a Get
> Latest Version (Recursive). My solution file and the two project files =
are
> now "Renegade". All other files are in "Normal" state.
>
> So I did a recursive Get Latest from the client, and the three files we=
re
> still "Renegade".
>
> I then did a recursive Get Latest from the client, with "Modified local
> file" set to "Overwrite" and "Set File Time" set to "Check In". It work=
ed.
> Now everything is fine.
>
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> John Saunders=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 E-m=
ail: [email protected]
> Internet Engineer=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=
=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0 Tel: +1 508 621 3818
> WWW: www.surfcontrol.com=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=A0=
=A0=A0=A0=A0=A0=A0=A0=A0 Fax: +1 508 621 3921
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
> =A0=A0=A0=A0=A0 SurfControl - the World's #1 Web & E-mail Filtering Com=
pany
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
>
>
> -----Original Message-----
> From: Dan Schreiber [mailto:[email protected]]
> Sent: Wednesday, March 31, 2004 17:20
> To: Clayton Dool; Vault-List (E-mail)
> Subject: RE: [vault-list] Bug in automerge -- probably not
>
> When you lose changes, is it the case that none of your edits get
> merged, or
> is it that some of them seem to make, and some don't?
>
> If it is the former, it might have something to do with merging
> via the GUI
> client while the IDE is open.  Perhaps VS isn't picking up that the fil=
e
> changed underneath it?  Or, perhaps the file is overwritten
> because of some
> option setting in Vault?  When this happens, check the _sgbak
> folder to see
> whether the file got backed up, and what its state is in the backup.
>
> Also, you might want to view the file in the working folder after it is
> merged in the GUI client to verify that side of the equation is
> clean (or to
> figure out if it is the Vault client, the IDE client, or VS itself that=
 is
> the problem).
>
> -Dan
>
>
> > -----Original Message-----
> > From: [email protected]
> > [mailto:[email protected]]On Behalf Of Clayton Do=
ol
> > Sent: Wednesday, March 31, 2004 3:57 PM
> > To: Vault-List (E-mail)
> > Subject: RE: [vault-list] Bug in automerge -- probably not
> >
> >
> > This is what I am looking for, to find out if it is a problem
> people have
> > come across before or if it is isolated to just me.  If just me, then
> > probably some configuration or status of document within Visual
> Studios in
> > which this is happening.  Like I said, most time don't have problem, =
but
> > rare few times have lost recent changes.  I will focus on
> exactly what we
> > are doing to try and isolate this to user, system configuration,
> > or software
> > isolation.
> >
> > Thanks
> > - Clayton
>
> _______________________________________________
> vault-list mailing list
> [email protected]
> http://lists.sourcegear.com/cgi-bin/mailman/listinfo/vault-list
>
> Get the latest news on SurfControl and our products,
> subscribe to our monthly e-newsletter, SurfAdvisory at:
> http://www.surfcontrol.com/resources/surfadvisory/surfadvisory_signup.a=
spx
>
> *********************************************************************
> The information in this email is confidential and may be legally
> privileged. It is intended solely for the addressee. Access to this
> email by anyone else is unauthorized. If you are not the intended
> recipient, any disclosure, copying, distribution or any action taken
> or omitted to  be taken in reliance on it, is prohibited and may be
> unlawful. If you believe that you have received this email in error,
> please contact the sender.
> *********************************************************************
> SurfControl Inc.
> 100 Enterprise Way, Suite A110
> Scotts Valley, California 95066
> 831-440-2500
> _______________________________________________
> vault-list mailing list
> [email protected]
> http://lists.sourcegear.com/cgi-bin/mailman/listinfo/vault-list