logo       

no local copies to compare to: msg#00788

Subject: no local copies to compare to
hi,

I wanted to test how tla/arch handles conflicts, so I modified the same
file in two checkouts.

After running update --in-place to be able to commit from the second
checkout, two file was renamed to file.orig with the conflicting changes
in file.rej.

I merged in the changes by hand in file.orig, then make-log + commit. I
forgot to rename file.orig to just file, so arch (using the names
method) recorded the file as deleted. I then updated my first checkout,
causing file to be deleted there as well.

I noticed this and went back and renamed file.org -> file, then
comitted, expecting that the file would show up in the first checkout at
next update. However, now I get:

$ tla what-changed --diffs
what-changed: no local copies to compare to
(jg@xxxxxxxxxxxx/code--mainline--0.1--patch-5)
  consider `add-prisitine --help'

I am sure that this is simple, but could some please explain to me what
I am doing wrong and what is now expected from me?

Thanks,
Jacob


<Prev in Thread] Current Thread [Next in Thread>
Google Custom Search

Recently Viewed:
science.linguis...    culture.sf.lite...    video.mplayer.c...    yellowdog.gener...    ietf.rfc822/199...    emacs.help/2002...    redhat.release....    kernel.speakup/...    java.openejb.de...    debian.devel.gt...    xfree86.newbie/...    bug-tracking.ma...    pam/2003-05/msg...    games.devel.ope...    user-groups.lin...    music.pancham/2...    network.mq.deve...    web.html.genera...    arklinux.bugs/2...    linux.ecasound/...    qnx.openqnx.dev...    org.user-groups...    file-systems.sf...    trustix.contrib...   
Home | blog view | USPTO Patent Archive | advertise | OSDir is an inevitable website. super tiny logo

Free Magazines

Cisco News
Receive a free quarterly e-newsletter with exclusive articles on how Cisco IT uses its own products and solutions to enable the business.
subscribe

Systems Management News, the newspaper for IT systems administration and data center managers! Each issue of Systems Management News is chock-full of news and analysis to help you understand what's happening in your field.
subscribe

The Enterprise Newsweekly eWeek is the essential technology information source for builders of e-business.
subscribe

Oracle Magazine Oracle Magazine contains technology strategy articles, sample code, tips, Oracle and partner news, how to articles for developers and DBAs, and more. Oracle (NASDAQ: ORCL) is the world's largest enterprise software company.
subscribe

Total Telecom Total Telecom is "The Economist of the communications industry".
subscribe