Subrepos in 1.3

Mirko Viviani mirko at objectlab.org
Wed Jul 15 13:54:47 CDT 2009


On 15/lug/09, at 20:15, Matt Mackall wrote:

> You are surely missing something: a push is a push whether it's in a
> subrepo or just a normal repo. I suspect somehow the pushes you're
> showing are going to different destinations. The double slash below is
> suspicious. Try running with --debug.
>
>> pushing to /Users/Accounts/mirko/hg/myrepo//olframeworks

The pushes are going to the same repository, /Users/Accounts/mirko/hg/ 
myrepo without symlinks.
But I don't know why there is a double slash using forest.


The starting repo:

olive:PointsDeVue mirko$ pwd
/Users/Accounts/mirko/src/myrepo

olive:myrepo mirko$ hg --version
Mercurial Distributed SCM (version 1.3)

Copyright (C) 2005-2009 Matt Mackall <mpm at selenic.com> and others
This is free software; see the source for copying conditions. There is  
NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR  
PURPOSE.


This is the starting point:


olive:myrepo mirko$ hg push --debug ~/hg/myrepo/
pushing to /Users/Accounts/mirko/hg/myrepo/
pushing subrepo olframeworks
searching for changes
common changesets up to 663f24585522
no changes found
searching for changes
common changesets up to b4277eb5b5a4
no changes found

olive:myrepo mirko$ hg fpush --debug ~/hg/myrepo/
searching for repos in /Users/Accounts/mirko/src/myrepo
[.]
pushing to /Users/Accounts/mirko/hg/myrepo/
pushing subrepo olframeworks
searching for changes
common changesets up to 663f24585522
no changes found
searching for changes
common changesets up to b4277eb5b5a4
no changes found

[olframeworks]
pushing to /Users/Accounts/mirko/hg/myrepo//olframeworks
searching for changes
common changesets up to 663f24585522
no changes found


Just a little change in the subrepo:

olive:myrepo mirko$ hg -R olframeworks commit


push does not add the changeset:


olive:myrepo mirko$ hg push --debug ~/hg/myrepo/
pushing to /Users/Accounts/mirko/hg/myrepo/
pushing subrepo olframeworks
searching for changes
common changesets up to 82ca75092a8d    <--- this is wrong. ~/hg/ 
myrepo/olframeworks is stuk at 663f24585522
no changes found
searching for changes
common changesets up to b4277eb5b5a4
no changes found


fpush:


olive:myrepo mirko$ hg fpush --debug ~/hg/myrepo/
searching for repos in /Users/Accounts/mirko/src/myrepo
[.]
pushing to /Users/Accounts/mirko/hg/myrepo/
pushing subrepo olframeworks
searching for changes
common changesets up to 82ca75092a8d
no changes found
searching for changes
common changesets up to b4277eb5b5a4
no changes found

[olframeworks]
pushing to /Users/Accounts/mirko/hg/myrepo//olframeworks
searching for changes
common changesets up to 663f24585522
1 changesets found
list of changesets:
82ca75092a8db48d5fdd7d9e9db2e27225cd2a25
adding changesets
add changeset 82ca75092a8d
adding manifests
adding file changes
adding OLFoundation/src/NSFileManager_extensions.m revisions
added 1 changesets with 1 changes to 1 files
updating the branch cache

olive:myrepo mirko$ cat .hgsubstate
663f24585522c05ef08d369b55d18dbe641151c4 olframeworks



Hmmm... it seems like that subrepos-push is looking for changes  
comparing the same sub-repository.
Is this file correct?

olive:myrepo mirko$ cat .hgsub
olframeworks = olframeworks


hg update does not recurse in subrepos, but it updates the working  
copy using -R <repo>

-- 
Ciao,
Mirko



More information about the Mercurial mailing list