Re: [fossil-users] Fossil not removing files when switching branches

[Stephan Beal]

On Wed, Jul 13, 2011 at 11:55 PM, Joshua Paine wrote:

> would include "THIS COMMAND HAS NO PRACTICAL USE", and since that's the
> case, it should really just go away and not be hidden.


There is at least one practical use - to prepare the tree for distribution -
since close removes the _FOSSIL_ file. But:

  rm _FOSSIL_

is as easy to use (and arguably more intuitive) than:

  fossil close

-- 
- stephan beal
http://wanderinghorse.net/home/stephan/
___
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] Fossil not removing files when switching branches

[Mike Meyer]

On Wed, 13 Jul 2011 19:30:08 -0400
Joshua Paine  wrote:
> On 7/13/2011 7:13 PM, Brian Cottingham wrote:
> > was wondering if some of the Fossil internals
> > could be refactored to not need an explicit 'open' command. I.E., Git
> > and SVN don't need an open command- you just cd into a repo's directory
> > and stuff works. Could Fossil be reworked to act similarly?
> 
> Ok, now I see. In git the repo is a hidden directory containing many 
> files stored in the same directory as the 'working copy' (to use a SVN 
> term). The fossil repo, however, is a single SQLite database file with a 
> special schema.
> 
> So there is no repo directory to CD into until you open a repo in a 
> directory. Once you've done that (one-time operation), all the commands 
> do work in that dir without further fanfare.
> 
> I don't see this changing anytime soon, as drh (I believe) regards this 
> as a feature. I agree, fwiw.

So do I. This means fossil can do something that you can't do with git
or hg (and probably other DSCMs) that CSCMs do: have multiple working
copies open from the same repo. I use this to keep different working
copies open to different branches, so I can move code between branches
just by merging. If I were using a hg or git, I'd have to push/pull
the changes between the repos in each working copy before I could
merge them.

   http://www.mired.org/
Independent Software developer/SCM consultant, email for more information.

O< ascii ribbon campaign - stop html mail - www.asciiribbon.org
___
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] Fossil not removing files when switching branches

[Joshua Paine]

On 7/13/2011 7:13 PM, Brian Cottingham wrote:
> was wondering if some of the Fossil internals
> could be refactored to not need an explicit 'open' command. I.E., Git
> and SVN don't need an open command- you just cd into a repo's directory
> and stuff works. Could Fossil be reworked to act similarly?

Ok, now I see. In git the repo is a hidden directory containing many 
files stored in the same directory as the 'working copy' (to use a SVN 
term). The fossil repo, however, is a single SQLite database file with a 
special schema.

So there is no repo directory to CD into until you open a repo in a 
directory. Once you've done that (one-time operation), all the commands 
do work in that dir without further fanfare.

I don't see this changing anytime soon, as drh (I believe) regards this 
as a feature. I agree, fwiw. Besides the coolness of a very portable and 
backup-able repo file and among other things, it makes it really trivial 
to have different branches of the same repo open at the same time in 
different directories without recourse to an outside server (or indeed 
any server). I expect that's possible in git, too, but of all the git 
users I know personally, I'm pretty sure none of them know how. (I don't.)

-- 
Joshua Paine
LetterBlock: Web Applications Built With Joy
http://letterblock.com/
301-576-1920
___
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] Fossil not removing files when switching branches

[Martin Gagnon]

To me, open on fossil does similar work as checkout on some SCM. 

-- 
Martin


Le 2011-07-13 à 19:13, Brian Cottingham  a écrit :

> I am a newbie to Fossil, and intermediate to VCS in general. I have a basic 
> grasp of the Fossil commands needed to accomplish various tasks, but not much 
> understanding of what's going on under the hood. 
> 
> I understand 'open' performs an important job (though I'm fuzzy on most of 
> what it does), but was wondering if some of the Fossil internals could be 
> refactored to not need an explicit 'open' command. I.E., Git and SVN don't 
> need an open command- you just cd into a repo's directory and stuff works. 
> Could Fossil be reworked to act similarly?
> 
> 
> On Wed, Jul 13, 2011 at 6:56 PM, Joshua Paine  wrote:
> On 7/13/2011 6:42 PM, Brian Cottingham wrote:
> > If the close command is removed is there still a need for 'open'?
> 
> Truly no offense intended, Brian, but are you one of these newbies we're
> speaking about? `fossil open` is absolutely essential. It could be named
> something else (though nothing better comes to mind and I don't
> recommend it), but it certainly couldn't be gotten rid of.
> 
> > I'd imagine with no close command a lot of newbies will ask "I opened
> > my Fossil repo and can't figure out how to close it".
> 
> If this happens, it's better than them wasting their time; building
> unhelpful habits of routinely closing the repo; and forming mistaken
> beliefs about how the other commands interact with open and close based
> on a false model of the system until something goes weird and they come
> asking about their latest problem on the list (and we have a couple back
> and forths figuring out that their workflow is broken). The preceding is
> absolutely not hypothetical but a true summary of any number of threads
> on this list.
> 
> --
> Joshua Paine
> LetterBlock: Web Applications Built With Joy
> http://letterblock.com/
> 301-576-1920
> ___
> fossil-users mailing list
> fossil-users@lists.fossil-scm.org
> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
> 
> ___
> fossil-users mailing list
> fossil-users@lists.fossil-scm.org
> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
___
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] Fossil not removing files when switching branches

[Brian Cottingham]

I am a newbie to Fossil, and intermediate to VCS in general. I have a basic
grasp of the Fossil commands needed to accomplish various tasks, but not
much understanding of what's going on under the hood.

I understand 'open' performs an important job (though I'm fuzzy on most of
what it does), but was wondering if some of the Fossil internals could be
refactored to not need an explicit 'open' command. I.E., Git and SVN don't
need an open command- you just cd into a repo's directory and stuff works.
Could Fossil be reworked to act similarly?


On Wed, Jul 13, 2011 at 6:56 PM, Joshua Paine wrote:

> On 7/13/2011 6:42 PM, Brian Cottingham wrote:
> > If the close command is removed is there still a need for 'open'?
>
> Truly no offense intended, Brian, but are you one of these newbies we're
> speaking about? `fossil open` is absolutely essential. It could be named
> something else (though nothing better comes to mind and I don't
> recommend it), but it certainly couldn't be gotten rid of.
>
> > I'd imagine with no close command a lot of newbies will ask "I opened
> > my Fossil repo and can't figure out how to close it".
>
> If this happens, it's better than them wasting their time; building
> unhelpful habits of routinely closing the repo; and forming mistaken
> beliefs about how the other commands interact with open and close based
> on a false model of the system until something goes weird and they come
> asking about their latest problem on the list (and we have a couple back
> and forths figuring out that their workflow is broken). The preceding is
> absolutely not hypothetical but a true summary of any number of threads
> on this list.
>
> --
> Joshua Paine
> LetterBlock: Web Applications Built With Joy
> http://letterblock.com/
> 301-576-1920
> ___
> fossil-users mailing list
> fossil-users@lists.fossil-scm.org
> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
>
___
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] Fossil not removing files when switching branches

[Joshua Paine]

On 7/13/2011 6:42 PM, Brian Cottingham wrote:
> If the close command is removed is there still a need for 'open'?

Truly no offense intended, Brian, but are you one of these newbies we're
speaking about? `fossil open` is absolutely essential. It could be named
something else (though nothing better comes to mind and I don't
recommend it), but it certainly couldn't be gotten rid of.

> I'd imagine with no close command a lot of newbies will ask "I opened
> my Fossil repo and can't figure out how to close it".

If this happens, it's better than them wasting their time; building 
unhelpful habits of routinely closing the repo; and forming mistaken 
beliefs about how the other commands interact with open and close based 
on a false model of the system until something goes weird and they come 
asking about their latest problem on the list (and we have a couple back 
and forths figuring out that their workflow is broken). The preceding is 
absolutely not hypothetical but a true summary of any number of threads 
on this list.

--
Joshua Paine
LetterBlock: Web Applications Built With Joy
http://letterblock.com/
301-576-1920
___
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] Fossil not removing files when switching branches

[Brian Cottingham]

If the close command is removed is there still a need for 'open'? I'd
imagine with no close command a lot of newbies will ask "I opened my Fossil
repo and can't figure out how to close it".


On Wed, Jul 13, 2011 at 5:55 PM, Joshua Paine wrote:

> On 7/13/2011 5:48 PM, Brian Smith wrote:
> > I might suggest amending the help command to list commonly used
> > commands by default,
> > and a new switch --all that will display the uncommon ones (such as
> close).
>
> Fine, I guess, but many a smart person trying to learn a new system
> would use the --all option, so a really helpful help text for 'close'
> would include "THIS COMMAND HAS NO PRACTICAL USE", and since that's the
> case, it should really just go away and not be hidden.
>
> --
> Joshua Paine
> LetterBlock: Web Applications Built With Joy
> http://letterblock.com/
> 301-576-1920
> ___
> fossil-users mailing list
> fossil-users@lists.fossil-scm.org
> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
>
___
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] Fossil not removing files when switching branches

[Joshua Paine]

On 7/13/2011 5:48 PM, Brian Smith wrote:
> I might suggest amending the help command to list commonly used
> commands by default,
> and a new switch --all that will display the uncommon ones (such as close).

Fine, I guess, but many a smart person trying to learn a new system 
would use the --all option, so a really helpful help text for 'close' 
would include "THIS COMMAND HAS NO PRACTICAL USE", and since that's the 
case, it should really just go away and not be hidden.

-- 
Joshua Paine
LetterBlock: Web Applications Built With Joy
http://letterblock.com/
301-576-1920
___
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] Fossil not removing files when switching branches

[Brian Smith]

I might suggest amending the help command to list commonly used
commands by default,
and a new switch --all that will display the uncommon ones (such as close).

-B

On Wed, Jul 13, 2011 at 2:44 PM, Joshua Paine  wrote:
> On 7/13/2011 3:45 PM, Richard Hipp wrote:
>> My recommendation is that you never use the "close" command.  It really
>> is not needed for anything.  Maybe I should simply remove the "close"
>> command to avoid confusion?
>
> Considering the number of messages we've had over time where someone was
> expecting open and close to be used together in their daily workflow the
> way they would open and close a project in an IDE, perhaps, and given
> that close at most deletes three files, I say, yes, remove the command.
>
> --
> Joshua Paine
> LetterBlock: Web Applications Built With Joy
> http://letterblock.com/
> 301-576-1920
> ___
> fossil-users mailing list
> fossil-users@lists.fossil-scm.org
> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
>
___
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] Fossil not removing files when switching branches

[Joshua Paine]

On 7/13/2011 3:45 PM, Richard Hipp wrote:
> My recommendation is that you never use the "close" command.  It really
> is not needed for anything.  Maybe I should simply remove the "close"
> command to avoid confusion?

Considering the number of messages we've had over time where someone was 
expecting open and close to be used together in their daily workflow the 
way they would open and close a project in an IDE, perhaps, and given 
that close at most deletes three files, I say, yes, remove the command.

-- 
Joshua Paine
LetterBlock: Web Applications Built With Joy
http://letterblock.com/
301-576-1920
___
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] Fossil not removing files when switching branches

[Brian Cottingham]

That would be helpful. I got the idea to use 'close' from section 4.4.4 of
the fossil book, which indicates branches should be checked out by using
'open'. I thought to myself, "how could I open it if it is not first
closed?", and thus my confusion was born.


On Wed, Jul 13, 2011 at 3:45 PM, Richard Hipp  wrote:

>
>
> On Wed, Jul 13, 2011 at 3:33 PM, Brian Cottingham wrote:
>
>>
>> Should fossil close/open behave differently from fossil update? Is this a
>> bug in Fossil, or is it deliberate?
>>
>>
>>
> The behavior is deliberate.  I'd understand what you are expecting from
> close.
>
> My recommendation is that you never use the "close" command.  It really is
> not needed for anything.  Maybe I should simply remove the "close" command
> to avoid confusion?
>
>
> D. Richard Hipp
> d...@sqlite.org
>
> ___
> fossil-users mailing list
> fossil-users@lists.fossil-scm.org
> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
>
>
___
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] Fossil not removing files when switching branches

[Richard Hipp]

On Wed, Jul 13, 2011 at 3:33 PM, Brian Cottingham wrote:

>
> Should fossil close/open behave differently from fossil update? Is this a
> bug in Fossil, or is it deliberate?
>
>
>
The behavior is deliberate.  I'd understand what you are expecting from
close.

My recommendation is that you never use the "close" command.  It really is
not needed for anything.  Maybe I should simply remove the "close" command
to avoid confusion?


D. Richard Hipp
d...@sqlite.org
___
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] Fossil not removing files when switching branches

[Tomek Kott]

I believe it is deliberate with how fossil handles opening a repository full
of potentially un-versioned files. Imagine giving a "fossil open" of a fresh
repository in a folder with thousands of files, and finding that after the
command, all those files are gone.

Tomek

On Wed, Jul 13, 2011 at 3:33 PM, Brian Cottingham wrote:

> Yep, that does the trick. I'd seen the update command but didn't realise
> this was its purpose.
>
> Should fossil close/open behave differently from fossil update? Is this a
> bug in Fossil, or is it deliberate?
>
>
>
> On Wed, Jul 13, 2011 at 3:20 PM, Andreas Kupries  > wrote:
>
>> On 7/13/2011 12:14 PM, Tomek Kott wrote:
>> > I think the issue is that "fossil close" doesn't clear out the
>> directory, and
>> > "fossil open" I only overwrites files from the opened checkout, but does
>> not
>> > delete any files. So if you were to issue "fossil extras" my guess is
>> file2
>> > would be in that list.
>>
>> To change branches it is not necessary to 'close' the workspace.
>> Just do
>>
>>fossil update 
>>
>> That will properly remove/add/update the files in the workspace.
>>
>> >
>> > Tomek
>> >
>> > On Wed, Jul 13, 2011 at 2:55 PM, Brian Cottingham > > > wrote:
>> >
>> > When I switch between branches Fossil isn't removing files that
>> belong to
>> > the previous branch but not the current branch. Am I doing something
>> wrong?
>> >
>> > Example:
>> > ===
>> > $ fossil new prj.fossil
>> > project-id: 7e92eb48abd299ca1340a7bc0c86dba38097ad3e
>> > server-id:  7efed910652f4fbceef4ec8cdcb152e7c944e7cc
>> > admin-user: spiffy (initial password is "efa50e")
>> >
>> > $ fossil open prj.fossil
>> >
>> > $ touch new_file
>> >
>> > $ fossil add new_file
>> > ADDED  new_file
>> >
>> > $ fossil commit -m "added a file"
>> > New_Version: 8d4d39876638575032bc831ac5f88974c83d3beb
>> >
>> > $ fossil branch new branch2 trunk
>> > gpg: no default secret key: secret key not available
>> > gpg: out-1D64657C0C0F0F82BE9E: clearsign failed: secret key not
>> available
>> > unable to sign manifest.  continue (y/N)? y
>> > New branch: 7c68434806ceddcb1d72949deb5b8caffe1fd58f
>> >
>> > $ fossil close
>> >
>> > $ fossil open prj.fossil branch2
>> > project-name: 
>> > repository:   /tmp/tmp_project/prj.fossil
>> > local-root:   /tmp/tmp_project/
>> > project-code: 7e92eb48abd299ca1340a7bc0c86dba38097ad3e
>> > server-code:  7efed910652f4fbceef4ec8cdcb152e7c944e7cc
>> > checkout: 7c68434806ceddcb1d72949deb5b8caffe1fd58f 2011-07-13
>> 18:43:55 UTC
>> > parent:   8d4d39876638575032bc831ac5f88974c83d3beb 2011-07-13
>> 18:43:36 UTC
>> > tags: branch2
>> > comment:  Create new branch named "branch2" (user: spiffy)
>> >
>> > $ ls
>> > _FOSSIL_  new_file  prj.fossil
>> >
>> > $ touch file2
>> >
>> > $ fossil add file2
>> > ADDED  file2
>> >
>> > $ fossil commit -m "Added another file"
>> > New_Version: b8d0fde1bfc76e4d25a897fd0d2f6d346cb2577a
>> >
>> > $ fossil close
>> >
>> > $ fossil open prj.fossil
>> > project-name: 
>> > repository:   /tmp/tmp_project/prj.fossil
>> > local-root:   /tmp/tmp_project/
>> > project-code: 7e92eb48abd299ca1340a7bc0c86dba38097ad3e
>> > server-code:  7efed910652f4fbceef4ec8cdcb152e7c944e7cc
>> > checkout: 8d4d39876638575032bc831ac5f88974c83d3beb 2011-07-13
>> 18:43:36 UTC
>> > parent:   259984cdf37539a77ab9fb7e5da3255df7dd7729 2011-07-13
>> 18:42:54 UTC
>> > child:7c68434806ceddcb1d72949deb5b8caffe1fd58f 2011-07-13
>> 18:43:55 UTC
>> > tags: trunk
>> > comment:  added a fdle (user: spiffy)
>> >
>> > $ ls
>> > file2  _FOSSIL_  new_file  prj.fossil
>> > ===
>> >
>> > file2 should not appear when I am viewing the trunk branch because
>> it
>> > doesn't exist there- it only exists in the branch2 branch.
>> >
>> > ___
>> > fossil-users mailing list
>> > fossil-users@lists.fossil-scm.org > fossil-users@lists.fossil-scm.org>
>> >
>> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
>> >
>> >
>> >
>> >
>> > ___
>> > fossil-users mailing list
>> > fossil-users@lists.fossil-scm.org
>> > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
>>
>>
>> --
>> Andreas Kupries
>> Senior Tcl Developer
>> ActiveState, The Dynamic Language Experts
>>
>> P: 778.786.1122
>> F: 778.786.1133
>> andre...@activestate.com
>> http://www.activestate.com
>> Get insights on Open Source and Dynamic Languages at
>> www.activestate.com/blog
>> ___
>> fossil-users mailing list
>> fossil-users@lists.fossil-scm.org
>> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
>>
>
>
> ___
> f

Re: [fossil-users] Fossil not removing files when switching branches

[Andreas Kupries]

On 7/13/2011 12:33 PM, Brian Cottingham wrote:
> Yep, that does the trick. I'd seen the update command but didn't realise this
> was its purpose.

Well, its purpose is to switch the current checkout/rev to any other revision, 
so switching between branches is just a special case of that. With the common 
case of
f pull ; f update
to bring external changes on the current branch into the current workspace.

% f help update

Usage: fossil update ?VERSION? ?FILES...?

Change the version of the current checkout to VERSION.  Any uncommitted
changes are retained and applied to the new checkout.

[...]

>
> Should fossil close/open behave differently from fossil update? Is this a bug
> in Fossil, or is it deliberate?

That question will have to be answered by Richard, I believe.

>
>
> On Wed, Jul 13, 2011 at 3:20 PM, Andreas Kupries  > wrote:
>
> On 7/13/2011 12:14 PM, Tomek Kott wrote:
>  > I think the issue is that "fossil close" doesn't clear out the
> directory, and
>  > "fossil open" I only overwrites files from the opened checkout, but 
> does not
>  > delete any files. So if you were to issue "fossil extras" my guess is 
> file2
>  > would be in that list.
>
> To change branches it is not necessary to 'close' the workspace.
> Just do
>
> fossil update 
>
> That will properly remove/add/update the files in the workspace.
>
>  >
>  > Tomek
>  >
>  > On Wed, Jul 13, 2011 at 2:55 PM, Brian Cottingham  
>  > >> wrote:


-- 
Andreas Kupries
Senior Tcl Developer
ActiveState, The Dynamic Language Experts

P: 778.786.1122
F: 778.786.1133
andre...@activestate.com
http://www.activestate.com
Get insights on Open Source and Dynamic Languages at www.activestate.com/blog
___
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] Fossil not removing files when switching branches

[Brian Cottingham]

Yep, that does the trick. I'd seen the update command but didn't realise
this was its purpose.

Should fossil close/open behave differently from fossil update? Is this a
bug in Fossil, or is it deliberate?


On Wed, Jul 13, 2011 at 3:20 PM, Andreas Kupries
wrote:

> On 7/13/2011 12:14 PM, Tomek Kott wrote:
> > I think the issue is that "fossil close" doesn't clear out the directory,
> and
> > "fossil open" I only overwrites files from the opened checkout, but does
> not
> > delete any files. So if you were to issue "fossil extras" my guess is
> file2
> > would be in that list.
>
> To change branches it is not necessary to 'close' the workspace.
> Just do
>
>fossil update 
>
> That will properly remove/add/update the files in the workspace.
>
> >
> > Tomek
> >
> > On Wed, Jul 13, 2011 at 2:55 PM, Brian Cottingham  > > wrote:
> >
> > When I switch between branches Fossil isn't removing files that
> belong to
> > the previous branch but not the current branch. Am I doing something
> wrong?
> >
> > Example:
> > ===
> > $ fossil new prj.fossil
> > project-id: 7e92eb48abd299ca1340a7bc0c86dba38097ad3e
> > server-id:  7efed910652f4fbceef4ec8cdcb152e7c944e7cc
> > admin-user: spiffy (initial password is "efa50e")
> >
> > $ fossil open prj.fossil
> >
> > $ touch new_file
> >
> > $ fossil add new_file
> > ADDED  new_file
> >
> > $ fossil commit -m "added a file"
> > New_Version: 8d4d39876638575032bc831ac5f88974c83d3beb
> >
> > $ fossil branch new branch2 trunk
> > gpg: no default secret key: secret key not available
> > gpg: out-1D64657C0C0F0F82BE9E: clearsign failed: secret key not
> available
> > unable to sign manifest.  continue (y/N)? y
> > New branch: 7c68434806ceddcb1d72949deb5b8caffe1fd58f
> >
> > $ fossil close
> >
> > $ fossil open prj.fossil branch2
> > project-name: 
> > repository:   /tmp/tmp_project/prj.fossil
> > local-root:   /tmp/tmp_project/
> > project-code: 7e92eb48abd299ca1340a7bc0c86dba38097ad3e
> > server-code:  7efed910652f4fbceef4ec8cdcb152e7c944e7cc
> > checkout: 7c68434806ceddcb1d72949deb5b8caffe1fd58f 2011-07-13
> 18:43:55 UTC
> > parent:   8d4d39876638575032bc831ac5f88974c83d3beb 2011-07-13
> 18:43:36 UTC
> > tags: branch2
> > comment:  Create new branch named "branch2" (user: spiffy)
> >
> > $ ls
> > _FOSSIL_  new_file  prj.fossil
> >
> > $ touch file2
> >
> > $ fossil add file2
> > ADDED  file2
> >
> > $ fossil commit -m "Added another file"
> > New_Version: b8d0fde1bfc76e4d25a897fd0d2f6d346cb2577a
> >
> > $ fossil close
> >
> > $ fossil open prj.fossil
> > project-name: 
> > repository:   /tmp/tmp_project/prj.fossil
> > local-root:   /tmp/tmp_project/
> > project-code: 7e92eb48abd299ca1340a7bc0c86dba38097ad3e
> > server-code:  7efed910652f4fbceef4ec8cdcb152e7c944e7cc
> > checkout: 8d4d39876638575032bc831ac5f88974c83d3beb 2011-07-13
> 18:43:36 UTC
> > parent:   259984cdf37539a77ab9fb7e5da3255df7dd7729 2011-07-13
> 18:42:54 UTC
> > child:7c68434806ceddcb1d72949deb5b8caffe1fd58f 2011-07-13
> 18:43:55 UTC
> > tags: trunk
> > comment:  added a fdle (user: spiffy)
> >
> > $ ls
> > file2  _FOSSIL_  new_file  prj.fossil
> > ===
> >
> > file2 should not appear when I am viewing the trunk branch because it
> > doesn't exist there- it only exists in the branch2 branch.
> >
> > ___
> > fossil-users mailing list
> > fossil-users@lists.fossil-scm.org  fossil-users@lists.fossil-scm.org>
> >
> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
> >
> >
> >
> >
> > ___
> > fossil-users mailing list
> > fossil-users@lists.fossil-scm.org
> > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
>
>
> --
> Andreas Kupries
> Senior Tcl Developer
> ActiveState, The Dynamic Language Experts
>
> P: 778.786.1122
> F: 778.786.1133
> andre...@activestate.com
> http://www.activestate.com
> Get insights on Open Source and Dynamic Languages at
> www.activestate.com/blog
> ___
> fossil-users mailing list
> fossil-users@lists.fossil-scm.org
> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
>
___
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] Fossil not removing files when switching branches

[Andreas Kupries]

On 7/13/2011 12:14 PM, Tomek Kott wrote:
> I think the issue is that "fossil close" doesn't clear out the directory, and
> "fossil open" I only overwrites files from the opened checkout, but does not
> delete any files. So if you were to issue "fossil extras" my guess is file2
> would be in that list.

To change branches it is not necessary to 'close' the workspace.
Just do

fossil update 

That will properly remove/add/update the files in the workspace.

>
> Tomek
>
> On Wed, Jul 13, 2011 at 2:55 PM, Brian Cottingham  > wrote:
>
> When I switch between branches Fossil isn't removing files that belong to
> the previous branch but not the current branch. Am I doing something 
> wrong?
>
> Example:
> ===
> $ fossil new prj.fossil
> project-id: 7e92eb48abd299ca1340a7bc0c86dba38097ad3e
> server-id:  7efed910652f4fbceef4ec8cdcb152e7c944e7cc
> admin-user: spiffy (initial password is "efa50e")
>
> $ fossil open prj.fossil
>
> $ touch new_file
>
> $ fossil add new_file
> ADDED  new_file
>
> $ fossil commit -m "added a file"
> New_Version: 8d4d39876638575032bc831ac5f88974c83d3beb
>
> $ fossil branch new branch2 trunk
> gpg: no default secret key: secret key not available
> gpg: out-1D64657C0C0F0F82BE9E: clearsign failed: secret key not available
> unable to sign manifest.  continue (y/N)? y
> New branch: 7c68434806ceddcb1d72949deb5b8caffe1fd58f
>
> $ fossil close
>
> $ fossil open prj.fossil branch2
> project-name: 
> repository:   /tmp/tmp_project/prj.fossil
> local-root:   /tmp/tmp_project/
> project-code: 7e92eb48abd299ca1340a7bc0c86dba38097ad3e
> server-code:  7efed910652f4fbceef4ec8cdcb152e7c944e7cc
> checkout: 7c68434806ceddcb1d72949deb5b8caffe1fd58f 2011-07-13 
> 18:43:55 UTC
> parent:   8d4d39876638575032bc831ac5f88974c83d3beb 2011-07-13 
> 18:43:36 UTC
> tags: branch2
> comment:  Create new branch named "branch2" (user: spiffy)
>
> $ ls
> _FOSSIL_  new_file  prj.fossil
>
> $ touch file2
>
> $ fossil add file2
> ADDED  file2
>
> $ fossil commit -m "Added another file"
> New_Version: b8d0fde1bfc76e4d25a897fd0d2f6d346cb2577a
>
> $ fossil close
>
> $ fossil open prj.fossil
> project-name: 
> repository:   /tmp/tmp_project/prj.fossil
> local-root:   /tmp/tmp_project/
> project-code: 7e92eb48abd299ca1340a7bc0c86dba38097ad3e
> server-code:  7efed910652f4fbceef4ec8cdcb152e7c944e7cc
> checkout: 8d4d39876638575032bc831ac5f88974c83d3beb 2011-07-13 
> 18:43:36 UTC
> parent:   259984cdf37539a77ab9fb7e5da3255df7dd7729 2011-07-13 
> 18:42:54 UTC
> child:7c68434806ceddcb1d72949deb5b8caffe1fd58f 2011-07-13 
> 18:43:55 UTC
> tags: trunk
> comment:  added a fdle (user: spiffy)
>
> $ ls
> file2  _FOSSIL_  new_file  prj.fossil
> ===
>
> file2 should not appear when I am viewing the trunk branch because it
> doesn't exist there- it only exists in the branch2 branch.
>
> ___
> fossil-users mailing list
> fossil-users@lists.fossil-scm.org 
> 
> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
>
>
>
>
> ___
> fossil-users mailing list
> fossil-users@lists.fossil-scm.org
> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users


-- 
Andreas Kupries
Senior Tcl Developer
ActiveState, The Dynamic Language Experts

P: 778.786.1122
F: 778.786.1133
andre...@activestate.com
http://www.activestate.com
Get insights on Open Source and Dynamic Languages at www.activestate.com/blog
___
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] Fossil not removing files when switching branches

[Tomek Kott]

I think the issue is that "fossil close" doesn't clear out the directory,
and "fossil open" I only overwrites files from the opened checkout, but does
not delete any files. So if you were to issue "fossil extras" my guess is
file2 would be in that list.

Tomek

On Wed, Jul 13, 2011 at 2:55 PM, Brian Cottingham wrote:

> When I switch between branches Fossil isn't removing files that belong to
> the previous branch but not the current branch. Am I doing something wrong?
>
> Example:
> ===
> $ fossil new prj.fossil
> project-id: 7e92eb48abd299ca1340a7bc0c86dba38097ad3e
> server-id:  7efed910652f4fbceef4ec8cdcb152e7c944e7cc
> admin-user: spiffy (initial password is "efa50e")
>
> $ fossil open prj.fossil
>
> $ touch new_file
>
> $ fossil add new_file
> ADDED  new_file
>
> $ fossil commit -m "added a file"
> New_Version: 8d4d39876638575032bc831ac5f88974c83d3beb
>
> $ fossil branch new branch2 trunk
> gpg: no default secret key: secret key not available
> gpg: out-1D64657C0C0F0F82BE9E: clearsign failed: secret key not available
> unable to sign manifest.  continue (y/N)? y
> New branch: 7c68434806ceddcb1d72949deb5b8caffe1fd58f
>
> $ fossil close
>
> $ fossil open prj.fossil branch2
> project-name: 
> repository:   /tmp/tmp_project/prj.fossil
> local-root:   /tmp/tmp_project/
> project-code: 7e92eb48abd299ca1340a7bc0c86dba38097ad3e
> server-code:  7efed910652f4fbceef4ec8cdcb152e7c944e7cc
> checkout: 7c68434806ceddcb1d72949deb5b8caffe1fd58f 2011-07-13 18:43:55
> UTC
> parent:   8d4d39876638575032bc831ac5f88974c83d3beb 2011-07-13 18:43:36
> UTC
> tags: branch2
> comment:  Create new branch named "branch2" (user: spiffy)
>
> $ ls
> _FOSSIL_  new_file  prj.fossil
>
> $ touch file2
>
> $ fossil add file2
> ADDED  file2
>
> $ fossil commit -m "Added another file"
> New_Version: b8d0fde1bfc76e4d25a897fd0d2f6d346cb2577a
>
> $ fossil close
>
> $ fossil open prj.fossil
> project-name: 
> repository:   /tmp/tmp_project/prj.fossil
> local-root:   /tmp/tmp_project/
> project-code: 7e92eb48abd299ca1340a7bc0c86dba38097ad3e
> server-code:  7efed910652f4fbceef4ec8cdcb152e7c944e7cc
> checkout: 8d4d39876638575032bc831ac5f88974c83d3beb 2011-07-13 18:43:36
> UTC
> parent:   259984cdf37539a77ab9fb7e5da3255df7dd7729 2011-07-13 18:42:54
> UTC
> child:7c68434806ceddcb1d72949deb5b8caffe1fd58f 2011-07-13 18:43:55
> UTC
> tags: trunk
> comment:  added a fdle (user: spiffy)
>
> $ ls
> file2  _FOSSIL_  new_file  prj.fossil
> ===
>
> file2 should not appear when I am viewing the trunk branch because it
> doesn't exist there- it only exists in the branch2 branch.
>
> ___
> fossil-users mailing list
> fossil-users@lists.fossil-scm.org
> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
>
>
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

[fossil-users] Fossil not removing files when switching branches

[Brian Cottingham]

When I switch between branches Fossil isn't removing files that belong to
the previous branch but not the current branch. Am I doing something wrong?

Example:
===
$ fossil new prj.fossil
project-id: 7e92eb48abd299ca1340a7bc0c86dba38097ad3e
server-id:  7efed910652f4fbceef4ec8cdcb152e7c944e7cc
admin-user: spiffy (initial password is "efa50e")

$ fossil open prj.fossil

$ touch new_file

$ fossil add new_file
ADDED  new_file

$ fossil commit -m "added a file"
New_Version: 8d4d39876638575032bc831ac5f88974c83d3beb

$ fossil branch new branch2 trunk
gpg: no default secret key: secret key not available
gpg: out-1D64657C0C0F0F82BE9E: clearsign failed: secret key not available
unable to sign manifest.  continue (y/N)? y
New branch: 7c68434806ceddcb1d72949deb5b8caffe1fd58f

$ fossil close

$ fossil open prj.fossil branch2
project-name: 
repository:   /tmp/tmp_project/prj.fossil
local-root:   /tmp/tmp_project/
project-code: 7e92eb48abd299ca1340a7bc0c86dba38097ad3e
server-code:  7efed910652f4fbceef4ec8cdcb152e7c944e7cc
checkout: 7c68434806ceddcb1d72949deb5b8caffe1fd58f 2011-07-13 18:43:55
UTC
parent:   8d4d39876638575032bc831ac5f88974c83d3beb 2011-07-13 18:43:36
UTC
tags: branch2
comment:  Create new branch named "branch2" (user: spiffy)

$ ls
_FOSSIL_  new_file  prj.fossil

$ touch file2

$ fossil add file2
ADDED  file2

$ fossil commit -m "Added another file"
New_Version: b8d0fde1bfc76e4d25a897fd0d2f6d346cb2577a

$ fossil close

$ fossil open prj.fossil
project-name: 
repository:   /tmp/tmp_project/prj.fossil
local-root:   /tmp/tmp_project/
project-code: 7e92eb48abd299ca1340a7bc0c86dba38097ad3e
server-code:  7efed910652f4fbceef4ec8cdcb152e7c944e7cc
checkout: 8d4d39876638575032bc831ac5f88974c83d3beb 2011-07-13 18:43:36
UTC
parent:   259984cdf37539a77ab9fb7e5da3255df7dd7729 2011-07-13 18:42:54
UTC
child:7c68434806ceddcb1d72949deb5b8caffe1fd58f 2011-07-13 18:43:55
UTC
tags: trunk
comment:  added a fdle (user: spiffy)

$ ls
file2  _FOSSIL_  new_file  prj.fossil
===

file2 should not appear when I am viewing the trunk branch because it
doesn't exist there- it only exists in the branch2 branch.
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users