Undo an undesired merge in SVN -

-

we have repository running svn. @ moment, add feature (lets call 'branch'), created development branch main trunk (let's call 'trunk').

we kept doing our work , commiting branch, occasionally, merged changes made in trunk branch keep branch date trunk.

at point, revisions 75051 77691 trunk merged branch, , commits kept going on branch, commiting new code in branch.

but want branch date trunk revision 77089, is, want undo changes in branch due merge did, changes due rev77089-77691, without affecting work done in branch. suggestions revert or undo changes in branch due rev77089-77691 in trunk? thank much.

you can undo change use reverse range in svn merge command:

$ svn revert -r .   #remove changes made $ svn update        #and make sure date $ svn merge -r77691:77088 .

this rid of changes 77089 77691 working directory.

or can undo merge 1 revision @ time:

$ svn merge -c -77691 . $ svn merge -c -77690 . $ svn merge -c -77689 .

Comments

Post a Comment

Popular posts from this blog

Django REST Framework perform_create: You cannot call `.save()` after accessing `serializer.data` -

-
i have following viewset: class artistprofileviewset(viewsets.modelviewset): queryset = artistprofile.objects.all() serializer_class = artistprofileserializer def perform_create(self, serializer): if serializer.is_valid(): serializer.save() with following serializers: class simpleartisttrackserializer(serializers.hyperlinkedmodelserializer): class meta: model = artisttrack fields = (...my fields...) class artistprofileserializer(serializers.hyperlinkedmodelserializer): owners = userserializer(many=true, required=false) tracks = simpleartisttrackserializer(many=true, required=false) class meta: model = artistprofile fields = (...my fields...) i getting following error: assertionerror: cannot call `.save()` after accessing `serializer.data`.if need access data before committing database inspect 'serializer.validated_data' instead. i don't see editing serializer.data object. th...
Read more

Why does Go error when trying to marshal this JSON? -

-
i'm trying rather simple example of trying decode json file structs using golang. however, when attempting error that json: cannot unmarshal object go value of type []main.track which don't understand. here's code in question, , json can found here . package main import ( "encoding/json" "fmt" "net/http" "os" ) // tracks group of track types type tracks struct { tracks []track } // track represents singular track type track struct { name string url string artist artist } // artist represents single artist type artist struct { name string mbid string url string } func main() { url := "http://ws.audioscrobbler.com/2.0/?method=geo.gettoptracks&api_key=c1572082105bd40d247836b5c1819623&format=json&country=netherlands" response, err := http.get(url) if err != nil { fmt.printf("%s\n", err) os.exit(1) } de...
Read more