[fossil-users] How to cancel file added through add?

2013-01-08 Thread Gilles
Hello

How do we cancel the result of add, ie. tell Fossil to *not* add
such and such new file the next time the user runs fossil commit?

I need to do this sometimes when I mistakenly used add to add a new
file to the repository.

delete/rm seem to tell Fossil to stop watching a file (and keep all
the revisions in the repo): Remove one or more files or directories
from the repository.

I checked all the commands in fossil  help dummy, but didn't find a
command that looked like it did the trick.

Thank you.

___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] How to cancel file added through add?

2013-01-08 Thread David J. Weller-Fahy
* Gilles gilles.gana...@free.fr [2013-01-08 09:00 -0500]:
 How do we cancel the result of add, ie. tell Fossil to *not* add
 such and such new file the next time the user runs fossil commit?

I just tried using `fossil rm` on a mistakenly added file (in an
existing repository), and it does what you need.

#v+
dave@fork-pooh:~/tmp/sast.fossil/css$ touch t
dave@fork-pooh:~/tmp/sast.fossil/css$ fossil add t
ADDED  css/t
dave@fork-pooh:~/tmp/sast.fossil/css$ fossil rm t
DELETED css/t
dave@fork-pooh:~/tmp/sast.fossil/css$ fossil status
repository:   /home/dave/FOSSIL/sast.fossil
local-root:   /home/dave/tmp/sast.fossil/
checkout: 97085a7c5b559ae5d0fa0514c276014e6fd8db52 2013-01-08 13:54:43 UTC
parent:   2e8f22d3af1e698140537df0a1e33289f4e446b3 2013-01-08 03:07:22 UTC
tags: trunk
comment:  Link reference to posts to posts. (user: dave)
EDITED default.css
#v-

Regards,
-- 
dave [ please don't CC me ]


pgp8grszmc77K.pgp
Description: PGP signature
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] How to cancel file added through add?

2013-01-08 Thread Gilles
On Tue, 8 Jan 2013 09:21:10 -0500, David J. Weller-Fahy
dave-lists-fossil-us...@weller-fahy.com
wrote:
I just tried using `fossil rm` on a mistakenly added file (in an
existing repository), and it does what you need.

Thanks for the info. So the online help is a bit wrong:

Remove one or more files or directories from the repository.

This command does NOT remove the files from disk.  It just marks the
files as no longer being part of the project.  In other words, future
changes to the named files will not be versioned.

___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] How to cancel file added through add?

2013-01-08 Thread Joerg Sonnenberger
On Tue, Jan 08, 2013 at 02:59:10PM +0100, Gilles wrote:
   How do we cancel the result of add, ie. tell Fossil to *not* add
 such and such new file the next time the user runs fossil commit?

fossil revert. Arguably, it is a bug that fossil rm doesn't work.

Joerg
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] How to cancel file added through add?

2013-01-08 Thread Gilles
On Tue, 8 Jan 2013 15:50:10 +0100, Joerg Sonnenberger
jo...@britannica.bec.de wrote:

On Tue, Jan 08, 2013 at 02:59:10PM +0100, Gilles wrote:
  How do we cancel the result of add, ie. tell Fossil to *not* add
 such and such new file the next time the user runs fossil commit?

fossil revert. Arguably, it is a bug that fossil rm doesn't work.

Thanks but unless I'm mistaken, revert replaces the current files in
the work directory with the corresponding last revision in the repo.

I just want to tell Fossil to remove a file I added through add by
mistake, so that it's no longer listed when I type fossil changes.

___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] How to cancel file added through add?

2013-01-08 Thread Joerg Sonnenberger
On Tue, Jan 08, 2013 at 03:55:05PM +0100, Gilles wrote:
 On Tue, 8 Jan 2013 15:50:10 +0100, Joerg Sonnenberger
 jo...@britannica.bec.de wrote:
 
 On Tue, Jan 08, 2013 at 02:59:10PM +0100, Gilles wrote:
 How do we cancel the result of add, ie. tell Fossil to *not* add
  such and such new file the next time the user runs fossil commit?
 
 fossil revert. Arguably, it is a bug that fossil rm doesn't work.
 
 Thanks but unless I'm mistaken, revert replaces the current files in
 the work directory with the corresponding last revision in the repo.
 
 I just want to tell Fossil to remove a file I added through add by
 mistake, so that it's no longer listed when I type fossil changes.

fossil up foo
fossil add bar

Undo:

fossil revert bar

Joerg
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] How to cancel file added through add?

2013-01-08 Thread David J. Weller-Fahy
* Gilles gilles.gana...@free.fr [2013-01-08 09:27 -0500]:
 On Tue, 8 Jan 2013 09:21:10 -0500, David J. Weller-Fahy
 dave-lists-fossil-us...@weller-fahy.com
 wrote:
 I just tried using `fossil rm` on a mistakenly added file (in an
 existing repository), and it does what you need.
 
 Thanks for the info.

No worries, glad I could help!

 So the online help is a bit wrong:
 
 Remove one or more files or directories from the repository.
 
 This command does NOT remove the files from disk.  It just marks the
 files as no longer being part of the project.  In other words, future
 changes to the named files will not be versioned.

There have been many messages thrown around recently about the `fossil
rm` command (see the archives), but I would say the correctness of the
documentation depends on your definition of repository.  I think the
author wrote using the definition of repository where it does not
encompass the working set of files on disk (the checked out versions),
but only those things stored within the actual fossil file where all
artifacts are stored.

Looked at from that perspective, the documentation is correct, although
it could be more clear to those who come to the software without that
perspective.

Regards,
-- 
dave [ please don't CC me ]


pgpSYszSq9mLp.pgp
Description: PGP signature
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] How to cancel file added through add?

2013-01-08 Thread Gilles
On Tue, 8 Jan 2013 16:06:30 +0100, Joerg Sonnenberger
jo...@britannica.bec.de wrote:
 I just want to tell Fossil to remove a file I added through add by
 mistake, so that it's no longer listed when I type fossil changes.

fossil up foo
fossil add bar

Undo:

fossil revert bar

Thank you.

___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


Re: [fossil-users] How to cancel file added through add?

2013-01-08 Thread Gilles
On Tue, 8 Jan 2013 10:12:27 -0500, David J. Weller-Fahy
dave-lists-fossil-us...@weller-fahy.com
There have been many messages thrown around recently about the
`fossil
Looked at from that perspective, the documentation is correct, although
it could be more clear to those who come to the software without that
perspective.

Makes sense. In any case, it's always a bit involved to make the
distinction between the checked out version of a file (in the current
work directory) and the different versions available in the
repository.

Personally, I would have used fossil cancel myfile.c just to tell
Fossil to ignore this file that was added with, well, add.

___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users