← Back to branch summary

~facundo/ubuntuone-client/aq-slots

« back to all changes in this revision

Viewing changes to ubuntuone/u1sync/merge.py

  • Committer: Rodney Dawes
  • Date: 2009-06-26 17:01:42 UTC
  • mto: This revision was merged to the branch mainline in revision 60.
  • Revision ID: rodney.dawes@canonical.com-20090626170142-a738504rgnarizuw
        Remove the canonical namespace, and just use ubuntuone as the toplevel
        Move storage/syncdaemon and storage/u1sync up a level

Show diffs side-by-side

added added

removed removed

Lines of Context:
ubuntuone/u1sync/merge.py
1
 
# canonical.ubuntuone.storage.u1sync.merge
 
1
# ubuntuone.u1sync.merge
2
2
#
3
3
# Tree state merging
4
4
#
23
23
 
24
24
import os
25
25
 
26
 
from canonical.ubuntuone.storage.protocol.dircontent_pb2 import DIRECTORY
27
 
from canonical.ubuntuone.storage.u1sync.genericmerge import (
 
26
from ubuntuone.storageprotocol.dircontent_pb2 import DIRECTORY
 
27
from ubuntuone.u1sync.genericmerge import (
28
28
    MergeNode, generic_merge)
29
29
import uuid
30
30