updating my repository

[Guest]

Now that I have imported my files, I play at updating them, from an external source, still under Cygwin.

www> cm co . user/books/

www> cm mv user/books/wget.sh .

www> cm ci user/books/ .

www> find . -name wget.log

www> cm co . user user/books winfo

www> cm rm wget.log user/wget.log user/books/wget.log winfo/wget.log

www> cm ci . user user/books winfo

www> cm fp -R .

www> cm fp -R . | head | tr '\\' / | cut -d/ -f 7- | xargs rm

[There I needed to change the Windows absolute paths into Cygwin relative ones]

www> find . | wc -l

1337

www> wget -r -N -l inf -np -nH --cut-dirs=1 http://engbuildpc/~marc/user/books/memoirs 2>&1 | egrep '^Cannot write'

Cannot write to `user/books/memoirs/index.html' (Permission denied).

www> cm co user/books/memoirs/index.html

www> wget -r -N -l inf -np -nH --cut-dirs=1 http://engbuildpc/~marc/user/books/memoirs 2>&1 | egrep '^Cannot write'

Cannot write to `user/books/novels/index.html' (Permission denied).

Cannot write to `user/books/philo/0/0/ism.html' (Permission denied).

Cannot write to `user/books/novels/fk.html' (Permission denied).

www> cm co user/books/novels/index.html user/books/philo/0/0/ism.html user/books/novels/fk.html

Checking out user/books/novels/index.html ... Done

Checking out user/books/philo/0/0/ism.html ... Done

Checking out user/books/novels/fk.html ... Done

www> wget -r -N -l inf -np -nH --cut-dirs=1 http://engbuildpc/~marc/user/books/memoirs 2>&1 | egrep '^Cannot write'

Cannot write to `user/books/novels/2/ac.html' (Permission denied).

Cannot write to `user/books/novels/1/ds.html' (Permission denied).

www> cm co user/books/novels/2/ac.html user/books/novels/1/ds.html

Checking out user/books/novels/2/ac.html ... Done

Checking out user/books/novels/1/ds.html ... Done

www> wget -r -N -l inf -np -nH --cut-dirs=1 http://engbuildpc/~marc/user/books/memoirs 2>&1 | egrep '^Cannot write'

www> cm fp -R . | tr '\\' / | cut -d/ -f 7-

user/books/memoirs/0/ad.html

user/books/novels/2/do.html

www> find . | wc -l

1339

www> cm co user/books/memoirs/0 user/books/novels/2

www> cm fp -R . | tr '\\' / | cut -d/ -f 7- | xargs cm add

www> cm ci -R .

...

Created changeset 6

Ouch... I wanted probably to say:

cm fco | tr '\\' / | cut -d/ -f 7- | xargs cm ci

Anyway now:

www> cm fco

www> cm fp -R .

www> cm fc -R .

www>

How can I see the contents of this changeset?

Also, I failed to find how to display the diffs from one revision to the next, with 'cm dm'. And 'cm hst' is supposed to accept a recursive flag, but did not...

In fact, the process I followed here above seems quite heavy.

Anyway to 're-import' on top of the workspace, maybe in new branches?

[Borja]

To achieve that import, it will be easier to checkout everything (cm co -R *), overwrite files as needed, then checkin (cm ci -R *)

Checkin operation won't checkin files with same content. Unmodified files will print a warning message (can't checkin same data) and won't be checked in.

Once that is finished, you can un-checkout the rest of the files with

cm fco --format={4} |cm ci -

About the dm (diffmetrics) command, it is used to display the number of lines added/changed/removed between specified revisions, like this sample:

cm diffmetrics file1.c#br:/main#0 file1.c#br:/main#1

if you want to see the differences, try the cm diff command.

Cheers,

Borja